Git module fixed
Git module fixed
changed alert to have more info
syntax
syntax 2
added travis badge to README
increased test timeout
merge
syntax
Merge pull request #44 from PlantAlert/info

Updated alert with more info.
Merge pull request #47 from PlantAlert/test-timeout

increased test timeout
Merge pull request #45 from PlantAlert/readme

added travis badge to README
fixed merge conflicts in city and server