added new doors zimmerman
added trivial change to merge branch
Merge branch 'snowden'

trivial change to force merge
Merge branch 'master' into snowden

ours merge
Merge branch 'master' of github.com:GSPBetaGroup/PeetsDoorMonitorHeroku

merging from master which is somehow different