renamed *.coffee -> *.js.coffee and *.sass -> *.css.sass
Merge remote-tracking branch 'origin/master'

Conflicts:
	config.rb
added folder "build" in .gitignore