Conflicting
Merge branch 'master' of https://github.com/drewrwilson/playingaround

Conflicts:
	README.md