commit another thing
Merge remote-tracking branch 'origin/master'

Conflicts:
	views/_layout.html
home version
home version