Working on the API.
Merge branch 'master' of github.com:jdrydn/Angelhack2012