final changes for phase b
Merge branch 'master' of github.com:benjross/popwilleatitself