Merge branch 'flexus'
Uppdaterade README med TODO:
Tog bort "Patricks comments"
Merge branch 'patricksBranch'
Merge branch 'master' into flexus