Elton John is resolving merge-error
Merge branch 'master' of https://github.com/emilandreas/bongtest

Conflicts:
	README.md