initial homepage change
Merge branch 'master' of github.com:blackjacket401/zertica-changed

Conflicts:
	public/style.css