Added a test file
added hellothere to master
Merge branch 'develop'

Conflicts:
	hellothere