freature 1
freature 2
feature 3
freature 2

feature 3
Merge branch 'doug/feature' of https://github.com/DougSwanson/swanson into doug/feature
Merge branch 'master' into doug/feature