Added more keys stuff
Merge branch 'master' of github.com:DenerosArmy/pinkie