Updated
Merge branch 'master' of ssh://github.com/Codebryo/fh-ws-2014

Conflicts:
	README.md