added in angular
Merge remote-tracking branch 'origin/master'

Conflicts:
	Battleboats/Battleboats.Web/Battleboats.Web.csproj
	Battleboats/Battleboats.Web/Views/Home/Index.cshtml