Fixed #1 With Merge Conflict
Merge branch 'master' of https://github.com/DarkXShadowX21/MobileDevelopment