Initial commit
First test
Adding CNAME
rm cname
Adding CNAME again grgrgr
This will explode

Signed-off-by: Cristian Maureira Fredes <cmaureir@csrg.inf.utfsm.cl>
Merge branch 'master' of github.com:cmaureir/cmaureir.github.com

Conflicts:
	index.html