my stuff
Merge branch 'master' of https://github.com/TimMikeladze/tcss360-project