styling
Merge branch 'master' of github.com:TeamGlorious/explorify

recursive merge
Merge pull request #40 from sbokaie/master

styling
Here we go with big late night tired merge
Massive merge
Merge pull request #41 from MooreJesseB/master

Merging all night long!
128am
131am
239am