.
.
Merge branch 'master' of https://github.com/georgimanov/Team--TULIP-PINK-

Conflicts:
	BattleShots/BattleShots.Server/Scripts/main.js
	BattleShots/BattleShots.Server/index.html