sdfs
Merge branch 'master' of https://github.com/ITKWeb/BattleTower
serv
aa
server
server
Merge branch 'master' of https://github.com/ITKWeb/BattleTower

Conflicts:
	public/javascripts/item.js
	public/javascripts/main.js
	public/javascripts/network.js
	public/javascripts/projectil.js
 reload game
sdfs