changed from = something + to +=
Merge branch 'master' of github.com:jonac/concprog_project
Merge branch 'master' of github.com:jonac/concprog_project