Merging stuff
Merge branch 'newbranch'

Conflicts:
	README