created uh_oh
added feature 7
Merge branch 'feature_7' of https://github.com/zjzeit/example_repo into feature_7