some folders
added gitignore
changed to index-perso.html
add .gitignore
resolve conflicts
Add requireJS and move crafty to the lib folder
+ .jshintrc
added moveto.js
Merge branch 'master' of https://github.com/FranzPoize/5colordeathrow

Conflicts:
	.gitignore
	index.html
added color object
added game.js
Merge branch 'master' into gui
WIP