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


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