changed haiku
added a sonnet
Merge remote-tracking branch 'origin/master' into harish

Conflicts:
	haiku.txt
Merge pull request #1 from htella/harish

adding new features