'hackathon' in progress refactoring
Merge branch 'master' of https://github.com/WebDevSummit/random-recipes

Conflicts:
	.DS_Store
	.gitignore
	index.php