Removing blank lines
Merge branch 'master' of github.com:kholloway/AlarmServer