Merge branch 'master' into parallel_barnes
Merge branch 'parallel_barnes' of github.com:jonac/concprog_project into parallel_barnes