resolves merge conflict, moves views and routes to server folder
resolves merge conflict, moves views and routes to server folder
improves building layout
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
(feat) Data is now synced to database
Merge pull request #43 from aselbie/feat/database

(feat) Data is now synced to database
adds to refactoring of backbone, reorganizes some logic
fixed merge conflict
Merge pull request #42 from biversen21/master

buildings add based on available resouces. refactors to use new player model
continues refactor of backbone and starts integration with mongo
Merge branch 'master' of https://www.github.com/space-snow/space-snow