Rename readme file (had .txt on the end)
Merge branch 'master' into development