redesign
Merge branch 'master' of https://github.com/xiaohenry/ucsdace.github.com

Conflicts:
	img/geisel.jpg