api python file
Merge branch 'master' of github.com:deannataylor/API-project

Conflicts:
	api.py~
Merge branch 'master' of github.com:deannataylor/API-project