Add exercise1 task6
Merge branch 'master' of https://github.com/gshopov/up2013

Conflicts:
	exercises/exercise1/README.md