commit # 1 on 14/26
Commiting individual stuff
Merge branch 'master' of https://github.com/emikoroe/methods2group3