resolved merge conflict
resolved merge conflicts
added error messages to post /sources
Merge branch 'master' of github.com:gschorkopf/traffic_spy