issue #25 fix
Merge branch 'master' of https://github.com/camb416/Poison_2013

Conflicts:

RFIDBook/RFIDBook.xcodeproj/project.xcworkspace/xcuserdata/cam.xcuserdat
ad/UserInterfaceState.xcuserstate