week 2
Merge branch 'master' of https://github.com/criso8/app1

Conflicts:
	README.rdoc