formal research
Merge branch 'gh-pages' of https://github.com/gutknec3/template-1 into gh-pages

Conflicts:
	formal.html