Better stuff
Merge

Conflicts:
	HackBCALogo.png
	HackBCALogoTransparent.png
	favicon.ico