adding stuff
resolving merge
testing out get request
Merge branch 'master' of heroku.com:fierce-fortress-3120
display data
current_user error
please work
grabbing token data
tryting to grab token data