more branch testing
Merge branch 'testBranch2'

Conflicts:
	partials/home.html