commits
Added a comment to the home controller
blah blah
Merge branch 'master' into ArbitraryBranch

Conflicts:
	.gitignore
Merge branch 'ArbitraryBranch'