Added API
Another Commit
Merge pull request #1 from michael-golfi/scott

Scott
Edited .gitignore
added DB
idk
Merge branch 'scott' into michael

Conflicts:
	McHacks/.classpath
	McHacks/AndroidManifest.xml
	McHacks/bin/AndroidManifest.xml
	McHacks/bin/McHacks.apk
	McHacks/bin/classes.dex
	McHacks/bin/classes/com/mchacks/MainActivity.class
	McHacks/bin/resources.ap_
	McHacks/src/com/mchacks/MainActivity.java