Merge branch 'master' of https://github.com/BerkeleyYearbook/Website

Conflicts:
	about.html
	faq.html
	group.html
	index.html
	portrait.html
	site/.htaccess
	site/about.html
	site/about.php
	site/faq.html
	site/faq.php
	site/group.html
	site/group.php
	site/index.html
	site/index.php
	site/portrait.html
	site/portrait.php