All files in Resume Assignment 1
Changed README as personal site and not course assignment
Updated information on Bio and Resume for Dec 2013
Testing subpage
Still changing
Update index.html
Merge branch 'master' into gh-pages

Conflicts:
	bio.html
	desktop.css
	index.html
Coordinating master and gh-pages