Temporary commit
Merge branch 'master' of github.com:caoyifanlyman/Fall-2013-CMUSDS
Get Device Type now works