Cleaning up.
Cleanup again.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	index.html
Jquery added.
 with '#' will be ignored, and an empty message aborts the commit.
Merge pull request #6 from Lucasargh/master

Adding jquery