bullshit
Merge branch 'master' of https://github.com/considerate/hallutslides

Conflicts:
	template.html