5f9a1bb Jun 7, 2016
@mortenjust fix conflict in readme
@mortenjust @youdly @Thiht @SamuelPoquette