lol
Merge branch 'master' of https://github.com/aryabov-igs/flats_backbone-mvc

Conflicts:
	Core/obj/Debug/Core.csprojResolveAssemblyReference.cache
	flats.v12.suo
	flats/App_Data/Flats.mdf
	flats/App_Data/Flats_log.ldf
	flats/Controllers/HomeController.cs
	flats/bin/flats.dll
	flats/bin/flats.pdb
	flats/obj/Debug/flats.csprojResolveAssemblyReference.cache
	flats/obj/Debug/flats.dll
	flats/obj/Debug/flats.pdb
+
add ignore