adding changes from last night
Merge branch 'master' of https://github.com/tommyrojo/AppliedRedesign