new file:   app/index.html
	new file:   app/scripts/app.js
	new file:   app/styles/box.css
	new file:   app/vendor/angular-1.2.0-rc.3/docs/.htaccess
	modified:   server.js
Merge branch 'master' of https://github.com/bennekrouf/comaz