bug fix
Merge branch 'master' of github.com:tgrosinger/Psychics-of-the-Future