Readme update
Merge branch 'master' of http://github.com/JeroenB91/Test

Conflicts:
	README.md