Intagram static widget, clock static widget
Merge branch 'master' of github.com:kiasaki/sw-sherbrooke-2014

Conflicts:
	package.json
	public/stylesheets/app.css
	routes/app.js
	views/app.jade