Update README.md
Merge branch 'master' of https://github.com/joshrhoderick/awesome-java into joshrhoderick-master

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