merge
Merge branch 'master' of github.com:richardfickling/Kroudid
Fix merge conflicts