gif screens
Merge branch 'master' of github.com:7bits/old-2013

Conflicts:
	js/screens/flush.js
..
..
Merge branch 'master' of github.com:7bits/old-2013

Conflicts:
	js/entities/level_change.js
	js/screens/play.js