yarr arr
VS commit
added fake doc
commited stashed changes
Merge branch 'myfreature'
Merge branch 'yarr'

Conflicts:
	TestGitProject/Controllers/HomeController.cs