wrong message test
added new
Merge branch 'master' of github.com:sparkleholic/shiny-bear into TEST

Conflicts:
	test.txt