Fixed map layout and basic support for obstacles
Merge branch 'master' of https://github.com/hwangy/RTS

Conflicts:
	game.js

Standard Merges