matt fix
Merge branch 'master' of https://github.com/mattritz229/bike4beds

Conflicts:
	public/.DS_Store