formatting
Merge branch 'master' of https://github.com/bwencke/eastmonroe

Conflicts:
	data.py
	index.py
Merge branch 'master' of https://github.com/bwencke/eastmonroe
rehgfrgdshsrdehrhrherherg