first commit from maeda
Merge branch 'master' of git://github.com/theTrueCaptian/GymnasticsApp