Added shortcuts
Merge branch 'master' of github.com:kristinbranson/JAABA