added Feature1
Added feature2
Added feturest to feature2
Merged feature2 additional into master
Adding feature3
Fixed bug #1
Really fixing bug#1
Fix1 added
Oh crap
oh crap
fixed