merged

• deputy
• batteries
• roué
• Erlang
• numskull