mac edit
feature 2 on pc
Merge branch 'feature2' of https://github.com/denaes/sourcetree_flow into feature2

Conflicts:
	feature2.txt
Merge branch 'release/1.0'