Week 5
Merge branch 'master' of https://github.com/gladpingvin42/Inda14

Merge of week 5 and previus week