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


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