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

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