pretty
Merge branch 'master' of https://github.com/bsorsch/Umecc

Conflicts:
	index.html