Temporary commit so I can pull/merge
Merge branch 'master' of git://github.com/allencct/Dvorak

Conflicts:
	javascript/buildings.js
Merge branch 'master' of git://github.com/allencct/Dvorak
Merge branch 'master' of git://github.com/allencct/Dvorak
Basic Ship creating functionality complete