random changes which occured during the presentation
Merge branch 'master' of github.com:Torwegia/cs660