Pickra/js-practice — pull request #2 by Pickra (2013-08-23 03:13:27+00:00)
Title: Merge pull request #1 from Pickra/master

merging master into gh-pages. i had originally created a complicated version of this and pushed it to github. then it broke. so i simplified it locally, but not b4 i did alota moving/copy + pasting/renaming craziness. i then commited a readme file in my repo master. when i tried to push my local i got an error message sayn "Your branch and 'origin/master' have diverged, # and have 3 and 1 different commit(s) each, respectively."

which got my panties in a knot. but all i had to do was pull from the repo master down to my local. and then merge into gh-pages from master to b able to view it online.

it's still kinda crappy, but @ least i made it go.

specific enuff???