complete rework
Merge branch 'master' of github.com:NiklasRosenstein/braum

Conflicts:
	README.md