branching demonstration
awesome question
I'm done here
Tanya's done
Merge branch 'feature/1_Tanyas' into develop

Conflicts:
	README.md
yeah 0.0.1 !
Merge branch 'release/0.0.1'