resolves merge conflict, moves views and routes to server folder
resolves merge conflict, moves views and routes to server folder
improves building layout
Merge pull request #38 from biversen21/master

adds stub for post/put to player/game routes. adds resource updating and...
Merge branch 'master' of https://github.com/TessMyers/space-snow
resolves merge conflict for building layout changes
Conflicts:
	client/scss/main.scss
	server/views/index.ejs
Merge branch 'master' of https://github.com/TessMyers/space-snow
resolves merge conflict for building layout changes
Conflicts:
	client/scss/main.scss
	server/views/index.ejs
Merge branch 'master' of https://github.com/TessMyers/space-snow
fixing extra divs detail
Merge pull request #40 from TessMyers/master

improves building layout
starts refactor of backbone
Merge branch 'master' of https://www.github.com/space-snow/space-snow
(refactor) Updates schema and moves stub data to new files
Merge pull request #41 from aselbie/refactor/stubs

(refactor) Updates schema and moves stub data to new files
fixed merge conflict
buildings add based on available resouces. refactors to use new player model