update
Merge branch 'master' of github.com:Fatteru/crackle

Conflicts:
	config.coffee