some stuff [uncomplete]
some stuff added package.json [uncomplete]
stuff
added ds_store to gitignore
test config
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore
	js/VerbalExpressions.js
	js/favicon.js
	js/jquery.html5uploader.js
	js/jquery.html5uploader.min.js
	js/src/VerbalExpressions.js
	js/src/favicon.js
	js/src/jquery.html5uploader.js
	js/src/jquery.html5uploader.min.js
	old/js/VerbalExpressions.js
	old/js/favicon.js
	old/js/jquery.html5uploader.js
	old/js/jquery.html5uploader.min.js
	old/js/main.js
changed stuff!!!
added build path to gitignore
yo
Merge branch 'master' of git://github.com/exane/fume into exane-master

Conflicts:
	.gitignore
	config/app.php
small changes