slideshow windy
Merge branch 'master' of https://github.com/MeatDigital/Alltomorrow

Conflicts:
	js/angular/functions.js
	templates/slideshow.html