Readme
Merge branch 'wesley' of https://github.com/v0ila/project_magik into ronald