Just some random stuff
Merge branch 'master' of https://github.com/dropje86/whatever

Conflicts:
	README.md