pulling extra stuff
Merge branch 'Development' of https://github.com/ThomasRahn/soen390 into Development