pulling from upstream
solving merge problems
pulling from upstream
latest version as off 2:49pm
setting up the loading screen with the image animation
solved merge conflicts
removed pry-rails from resque init
testing out the animation on the loading page
facebook key via ENV variable
interopolation style change
maybe an apostrophe will do the trick
Merge branch 'master' of github.com:fijimunkii/hintr
Merge branch 'master' of github.com:fijimunkii/hintr
fixed the scrapping problem
Merge pull request #20 from DeProdigy/master

fixed the scrapping problem
what
elseif commented out
conditional coffee
elsif
removed pry from scraper