Fixed more points
big fucking shit bro.
fixed conflicts
Added updated locations with most/all of our final paths.
Merge branch 'master' of https://github.com/tsurantino/IHateSnow
Fixed conflicts.
Fixed more conflicts.
Moved DirectionsView up so that it's not in the middle of the screen yo.