updates
Merge branch 'master' of github.com:cviebrock/laravel-101-slides

Conflicts:
	index.html