some thing conflicted.
Merge branch 'master' of git@github.com:pakchoidora/campfire-framework

Conflicts:
	src/lang/Node.js