A file
Second file added to feature 1
Feature 2 created
Merge branch 'develop' of https://github.com/baffled/geoflow into feature_2
Merge branch 'feature_2' into develop