Finished panic button
Merge branch 'master' of github.com:pdilyard/securehome-client