Merge pull request #1 from stuycs-softdev/api

Create test.py
Delete test.py
Merge branch 'master' into design

Conflicts:
	test.py
Update api.py
playing with api