changed the API version back
Merge branch 'master' of https://github.com/CMPUT301W14T02/Comput301Project
still trying to get 1st test to run, throws exception