test
abc
I resolved this conflict. Merge branch 'master' of github.com:IrwinKwan/silly

Conflicts:
	message_for_faezeh.txt
Added an end message.