Updated README
Merge branch 'master' of github.com:rmies/joy-of-coding-2014

Conflicts:
	README.md