working on settings, but pulling first
Merge branch 'master' of https://github.com/duke-compsci408-fall2014/PropelPro
settings now prepopulated