Updated with what is done. See e-mail for assigned tasks!
Merge branch 'master' of https://github.com/Boogleoodle/TrafficOMeter