more things
anotherfile
more things
Merge branch 'develop'

Conflicts:
	thing.rb