kitten added
rich.txt added
rich-01 merged into feature03
Merge branch 'feature03' into dev
Merge remote-tracking branch 'origin/dev'
Give full name to Tyrone
Rename file
Merge branch 'revert-test'

Conflicts:
	tyron.txt