adding more stuff to index
moved a file
Merge remote-tracking branch 'origin/jeff' into wes
added nav and logo
adjusting fonts
Merge remote-tracking branch 'origin/tal' into wes

Conflicts:
	assets/css/style.css
added new font files
Merge remote-tracking branch 'origin/wes' into jeff