small changes
Merge branch 'master' of github.com:ajvb/sbmakerspace-website

Conflicts:
	sbmakerspace/sbmakerspace/settings.py