no message
Merge remote-tracking branch 'origin/master' into gh-pages

# By Ciaran Hale (1) and thepig25 (1)
# Via Ciaran Hale (1) and thepig25 (1)
* origin/master:
  Replace master branch with page content via GitHub
  Another commit for testing

Conflicts:
	index.html
Removed unwanted content
Tracking Code
Merge remote-tracking branch 'origin/gh-pages'

* origin/gh-pages:
  Tracking Code
  Removed unwanted content
  no message