removes tmp/cache
merge conflicts
obnoxious file
Merge branch 'master' of github.com:vicfriedman/predictions
changed email font