updated makefile
Update documentation
jjMerge branch 'gh-pages'

Conflicts:
	index.html
Merge branch 'master' into source
meh
added output to gitignore
added favicon
force add favicon and CNAME