Merge pull request #1 from ptterb/master

mediaTest app
keyboard control for development without RFID readers
Merge pull request #3 from ptterb/mediaObject

Media object integrated
Merge pull request #2 from tomarthur/master

keyboard control for development without RFID readers
ignore more files
xcuserdata....
Merge branch 'master' of https://github.com/camb416/Poison_2013
Pull upstream changes in