fixed and added
Merge branch 'master' of http://github.com/zoesobin/zoesobin.github.com

Conflicts:
	portfolio/index.html