Merge branch 'master' of github.com:jahardin/TechBlog

Conflicts:
	TechBlog.Tests/obj/Debug/TechBlog.Tests.csprojResolveAssemblyReference.cache
	TechBlog/Views/Home/Index.cshtml
	TechBlog/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

Commit merge
got modals working with login and register
Merge branch 'master' of github.com:jahardin/TechBlog

Conflicts:
	TechBlog.Tests/obj/Debug/TechBlog.Tests.csprojResolveAssemblyReference.cache
	TechBlog/Views/Home/Index.cshtml
	TechBlog/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Test

t
Merge branch 'master' of https://github.com/jahardin/TechBlog

Conflicts:
	TechBlog.Tests/bin/Debug/TechBlog.Tests.dll
	TechBlog.Tests/bin/Debug/TechBlog.Tests.pdb
	TechBlog.Tests/bin/Debug/TechBlog.dll
	TechBlog.Tests/bin/Debug/TechBlog.pdb

	TechBlog.Tests/obj/Debug/TechBlog.Tests.csprojResolveAssemblyReference.cache
	TechBlog.Tests/obj/Debug/TechBlog.Tests.dll
	TechBlog.Tests/obj/Debug/TechBlog.Tests.pdb
	TechBlog/Views/Home/Index.cshtml
	TechBlog/app/app.js
	TechBlog/app/controllers/controllers.js
	TechBlog/app/directives/directives.js
	TechBlog/bin/TechBlog.dll
	TechBlog/bin/TechBlog.pdb
	TechBlog/obj/Debug/DesignTimeResolveAssemblyReferences.cache
	TechBlog/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	TechBlog/obj/Debug/TechBlog.dll
	TechBlog/obj/Debug/TechBlog.pdb