Merge branch 'master' of github.com:gnidan/ggj2014

Signed-off-by: Christopher McCann <chris@cmccanndesign.com>

Conflicts:
	app/main.coffee
Merge branch 'master' of github.com:gnidan/ggj2014

Signed-off-by: Christopher McCann <chris@cmccanndesign.com>

Conflicts:
	app/main.coffee