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
testing out the animation on the loading page
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