Prepping for pull.
Merge branch 'master' of github.com:craftsmancoding/lunchbox

Conflicts:
	assets/js/lunchbox.js