Update README.md
Merge branch 'master' of git://github.com/websudosuk/awesome-scala into websudosuk-master

Conflicts:
	README.md
Merge branch 'websudosuk-master'

Conflicts:
	README.md