merge fix
Merge branch 'master' of https://github.com/sgovindgari/PitchPeach

Conflicts:
	src/application/static/css/homestyle.css
	src/application/templates/base.html