Added skeleton
Use soft tabs
Merge branch 'dev'

Conflicts:
	app/src/states/gameState.coffee