freature 2

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