viveca morning july 22
Merge branch 'master' of https://github.com/vivecamorris/warrior_scholar