Fixed NaN issue
Added transition to Evan's points
Merge branch 'master' of github.com:JoshuaDickerson/hackvt-2014