commiting test stuff
Merge branch 'development' of https://github.com/Zeroe31890/ElectricFlurry into development
fixed photohandler issue I was having on my nexus
fixed merge conflict in manifest