sorry about the andriod manifest... also, i worked on picture a bit
Merge branch 'master' of https://github.com/CMPUT301W14T02/Comput301Project