Merge branch 'master' of https://github.com/thefinn93/milo

Conflicts:
	app/api.py
	app/models.py
Merged Alex's Branch