added link to beta version
added ignore
Merge branch 'devel'

Conflicts:
	.gitignore
	templates/counter.html
fixed print
fixed tracking
fixed tracking again
Merge branch 'master' of github.com:daftscience/daftscience into devel

Conflicts:
	static/js/counter.js
	templates/counterIncludes.html
	templates/layout.html