readme
Merge branch 'master' of https://github.com/JoshFerge/German

Conflicts:
	README.md