added task 3
added .gitignore file
Merge branch 'master' of github.com:alplecture2014/alp2014
added task 4
Merge branch 'master' of github.com:alplecture2014/alp2014
updated poem.txt
Merge branch 'master' of github.com:alplecture2014/alp2014

Conflicts:
	poem.txt