removed_underscores_for_function_names
Merge branch 'master' of github.com:missinglink/gamecraft
Atomic moving implemented in app.coffee
Merge branch 'master' of github.com:missinglink/gamecraft
removed other .DS_Store
Merge branch 'master' of github.com:missinglink/gamecraft
Added some get time functios
Merge branch 'master' of github.com:missinglink/gamecraft

Conflicts:
	js/.DS_Store
GameModel to keep track of time and other configs
Merge branch 'master' of github.com:missinglink/gamecraft

Conflicts:
	src/app.coffee
Merge branch 'master' of github.com:missinglink/gamecraft
Topbar decreasing with time
Merge branch 'master' of github.com:missinglink/gamecraft