scrolling bg
Merge branch 'master' of https://github.com/Trayus/ggj2014

Conflicts:
	basicEnemy.js
	main.js
Fixed conflicts