Finished Unit 5 Lesson 1 Assignment 1
Merge branch 'master' of https://github.com/methodmenon/Flask_API_Project

Conflicts:
	tests/api_tests.py
	tests/api_tests.pyc
Merge branch 'master' of https://github.com/methodmenon/Flask_API_Project Want to remove a mistaken commit