Starting work after spring break
Merge remote-tracking branch 'origin/master' into Brian
Uses new ultimate class from Parse