....................../´¯/)
....................,/¯../
.................../..../
............./´¯/'...'/´¯¯`·¸
........../'/.../..../......./¨¯\
........('(...´...´.... ¯~/'...')
.........\.................'...../
..........''...\.......... _.·´
............\..............(
..............\.............\...

(also to you alex)
Merge branch 'master' of https://github.com/Elementrat/MalicePhaser

Conflicts:
	app/js/all.js
	app/js/core/main.js