Basic updates route
Merge branch 'master' of github.com:aviaviavi/MeatUpServer

Conflicts:
	server.py
Clean up code, add descriptions