added line 4
Merge branch 'master' of http://github.com/aiden-deloryn/test

Conflicts:
	hello.txt