Bugfixing
Merge branch 'dev' into james_branch_2
Merge branch 'dev' of github.com:c1moore/cen3031project into dev