dg
Merge branch 'master' of git@github.com:lliiffee/cubface.git

Conflicts:
	home/index.html