tabs to spaces
Merge branch 'development'

Conflicts:
	ourmy_app/models.py
This should match what's in development (the merge was messy; this is the correct version)
A few small changes to fix before attempting deploy to heroku
delete duplicate requirement
Merge branch 'master' into development

Conflicts:
	ourmy_app/views.py