do not want swap files
added static number of stops
added lifts to areas
adding lifts
Merge branch 'master' of github.com:ChamGeeks/GetAroundChamonix into neills_ui
more ski areas and better styling
added areas of interest
Merge branch 'master' of github.com:ChamGeeks/GetAroundChamonix into neills_ui
more areas of interest
trying a modal for stops
hooked up the modal
back to actual pages
Merge branch 'master' of github.com:ChamGeeks/GetAroundChamonix into neills_ui

Conflicts:
	www/partials/select-stop.html
added true routing for journey