Commit in feature branch 6
Resolve conflict
Merge pull request #22 from hatchan/feature_branch_6

Commit in feature branch 6