first commit
Merge branch 'something'

trying something new
bye bye
added stuff
merged

Conflicts:
	README.md