Merge to remote
Merge branch 'master' of https://github.com/YoonSung/GalaxyWar.git

Conflicts:
	StarWars/doc/shard.sql
	StarWars/webapp/result.html