added syntax highlighting in readme
Merge branch 'master' into dev