add new
Merge branch 'master' of github.com:flamedancer/blue_test

Conflicts:
	hello.txt