Fancy Homepage
Merge branch 'master' of https://github.com/claudioccm/OpenData500

Conflicts:
	static/css/.sass-cache/5a9da83f957ade534810fa5ef0307aee68fb02f4/styles.scssc
Merge branch 'master' of https://github.com/claudioccm/OpenData500