Merge pull request #3 from mmitrik/feature

edit dev
asdf
Resolving the merge
Creating a new demo commit
Merge branch 'master' of https://github.com/mmitrik/RecipeDemo.git
change
behind
Merge pull request #5 from mmitrik/ahead

another change
client change
Update dev.txt
another client change
Merge branch 'feature'
Merge branch 'master' of https://github.com/mmitrik/RecipeDemo.git
update feature2
Merge pull request #9 from mmitrik/feature2

update feature2
testing tags
Merge branch 'feature' (VS)