Merge pull request #3 from SchoolAppGBA/master

Master