test w/ nams develop
Merge branch 'develop'
Merge branch 'master' of https://github.com/cclarke1028/letmetrythisout
added new lines