Hope this doesn't cause merge issues!!!
Merge branch 'master' of https://github.com/QuantumBox/QB-site

Conflicts:
	db/development.sqlite3
	log/development.log