Fixed Exception handling
added code for live machine verification
Merge pull request #1 from vachiwome/master

added code for live machine verification
Resolved conflicts
Merge branch 'vachiwome-master'
fixed merge (1)
fixed merge (2)
fix
resolved conflicts
merge complete
Merge branch 'master' of https://github.com/danielnyga/playdoh
added a log message