fixar fel
Merge branch 'master' of https://github.com/j0n/CMP-knows-git

Conflicts:
	index.html