new poem
Merge branch 'master' of https://github.com/ongkbk/lectdemo

Conflicts:
	roses.txt