Fixing Alex's crap!
Merge branch 'master' of github.com:ChooChooo/I-want-an-iPad