Merge pull request #1 from SycamoreEducation/gh-pages

Update OAuth Callback URL
Start of something wonderful
Removed function
Merge remote-tracking branch 'origin/gh-pages'

Conflicts:
	index.html
	oauth.html
Fixed merge error
Merge pull request #1 from TheBrockEllis/master

Sync Master With gh-pages