starting on feature 2
Merge branch 'master' into feature2
finished work on feature 2
final commit for release 2