Merge remote-tracking branch 'origin/roman'

Conflicts:
	.gitignore
	TitleTurtle/DBTest/bin/Debug/DBTest.dll
	TitleTurtle/DBTest/bin/Debug/DBTest.pdb
	TitleTurtle/DBTest/obj/Debug/DBTest.csproj.FileListAbsolute.txt

	TitleTurtle/DBTest/obj/Debug/DBTest.csprojResolveAssemblyReference.cache
	TitleTurtle/DBTest/obj/Debug/DBTest.dll
	TitleTurtle/DBTest/obj/Debug/DBTest.pdb
	TitleTurtle/TitleTurtle/App_Data/WebBlog111.mdf
	TitleTurtle/TitleTurtle/App_Data/WebBlog111_log.ldf
	TitleTurtle/TitleTurtle/App_Data/aspnet-TitleTurtle-20140718124954.mdf

	TitleTurtle/TitleTurtle/App_Data/aspnet-TitleTurtle-20140718124954_log.ldf
	TitleTurtle/TitleTurtle/Controllers/HomeController.cs
	TitleTurtle/TitleTurtle/bin/TitleTurtle.dll
	TitleTurtle/TitleTurtle/bin/TitleTurtle.pdb
	TitleTurtle/TitleTurtle/obj/Debug/TitleTurtle.dll
	TitleTurtle/TitleTurtle/obj/Debug/TitleTurtle.pdb
Merge remote-tracking branch 'origin/master'

Conflicts:
	TitleTurtle/TitleTurtle/App_Data/WebBlog111.mdf
	TitleTurtle/TitleTurtle/App_Data/WebBlog111_log.ldf
	TitleTurtle/TitleTurtle/App_Data/aspnet-TitleTurtle-20140718124954.mdf

	TitleTurtle/TitleTurtle/App_Data/aspnet-TitleTurtle-20140718124954_log.ldf
Merge remote-tracking branch 'origin/master'

Conflicts:
	TitleTurtle/TitleTurtle/App_Data/WebBlog111.mdf
	TitleTurtle/TitleTurtle/App_Data/WebBlog111_log.ldf
	TitleTurtle/TitleTurtle/App_Data/aspnet-TitleTurtle-20140718124954.mdf
	TitleTurtle/TitleTurtle/App_Data/aspnet-TitleTurtle-20140718124954_log.ldf