Added gh-pages
Merge branch 'master' of https://github.com/cmoody/Hal-9000

Conflicts:
	.gitignore
	Gruntfile.js
	package.json