in here
Merge branch 'dev' into testing

Conflicts:
	text.text
boring
made a change
Merge branch 'testing' into dev
modified more text
more things