cssfinalv2
Merge branch 'master' of https://github.com/Comp333/site

Conflicts:
	db/development.sqlite3
	log/development.log
	tmp/cache/assets/development/sprockets/2f5173deea6c795b8fdde723bb4b63af
	tmp/cache/assets/development/sprockets/f7cbd26ba1d28d48de824f0e94586655