added whoops
Merge branch 'master' of github.com:certifiedwebninja/blog

Conflicts:
	public/index.php
sup yo