oauth stuff
added route for hp
changed a.cr
Merge branch 'master' of github.com:rmoshier/SeeMore-Salmon into rc_tues
fixed git ignore conflict