sprint 2
Merge branch 'Development' of github.com:ThomasRahn/soen390 into Alan