html: fixes
gitignore
Merge branch 'master' of https://github.com/rooc/framework

Conflicts:
	.gitignore
	framework.sublime-workspace