Woohoo
Update README.md
Merge branch 'lolbranch'

Conflicts:
	README.md