moar styles!
Merge branch 'master' of https://github.com/flori/ablass
Merge branch 'master' of https://github.com/flori/ablass
Merge branch 'master' of https://github.com/flori/ablass

Conflicts:
	app/views/sin_projects/temperature.html.haml