Created an MVC project that uses boostrap, not much to it.
OMG WORDSiiiiiii
Merge branch 'master' of https://github.com/Armadous/GitTest

Conflicts:
	.gitattributes
	.gitignore