Remove Torte
Merge remote-tracking branch 'origin/master'

* origin/master:
  Update clock
  Added ClockChart, Weatherwidgets
  Add deploy.sh to sync ignore
  Update design
  Remove Torte

Conflicts:
	app/views/main.html
clock fixes