killing .cpp wherever it shows its ugly head
Merge branch 'master' of github.com:AmandaSutherland/ERRbot