merge
Merge branch 'master' of https://github.com/DeFranDeveloping/defrandeveloping.com

Conflicts:
	website/wsgi.py