Remove templates folder, to use submodule
Merge branch 'master' of github.com:alexsavio/pyss_talks

Conflicts:
	templates/custom.css
	templates/slides_config.py