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

Conflicts:
	static/js/main-home.js