added 2
first commit... let's begin!

Conflicts:
	README.md
Merge branch 'two'

Conflicts:
	little_rabbit_file