Merge branch 'master' of git@github.com:meekrab/handin01-11069.git

Change-Id: I60a92954c53e7956fab12d47a1c458a1762a95d2
Signed-off-by: sam <soren.m.olesen@gmail.com>
Merge branch 'master' of git@github.com:meekrab/handin01-11069.git


Change-Id: Ib987a0b58f07f0fa8b2f7eec57bc6ea4160fbe9f
Signed-off-by: sam <soren.m.olesen@gmail.com>