refactoring graphics
Merge branch 'master' of github.com:ClubEngine/GameJam6

Conflicts:
	js/graphics.js
	js/main.js
Merge branch 'master' of github.com:ClubEngine/GameJam6
Merge branch 'master' of github.com:ClubEngine/GameJam6
graphics: end of merge