gems
Merge branch 'master' of https://github.com/nwestfall/DeFaziosPizza

Conflicts:
	log/development.log
log
changes