Renamed some methods and variables
Merge branch 'master' of github.com:omgjens/it-assignment-2