added link/ bg change
Merge branch 'master' of https://github.com/xiaohenry/ucsdace.github.com

Conflicts:
	styles/ace.css