clean up and more testing completed
merge b4 deployment
Merge branch 'master' of github.com:rcrespo9/philosophy into joe-branch