gitigonre
merge
merge
merging
Merge branch 'master' of github.com:rooc/framework

Conflicts:
	.gitignore
	framework.sublime-project
	framework.sublime-workspace