ex
Merge branch 'master' of https://github.com/gg-trickitty/trickyJS

Conflicts:
	app/scripts/main.js