Praying I don't break anything else...

added a username cattadmin. @_@
Merge branch 'master' of https://github.com/QuantumBox/QB-site

Conflicts:
	db/development.sqlite3
	log/development.log
	tmp/cache/assets/C93/EE0/sprockets%2Fc311e13863dd427f6510b3d3045a2a41
	tmp/index/development/refinery/page/112_111_114.ind
	tmp/index/development/refinery/page/98_108_111.ind
	tmp/index/development/refinery/page/size
?! Favicon + logo

Stuff happened.