first commit
first commit
bugfixes
Merge branch 'master' of github.com:webdesignberlin/standard

Conflicts:
	README.md