foot
Merge branch 'master' of github.com:kseth/Bananaz

Conflicts:
	templates/home.html