Added iframe for tumblr
linked navstyle
Merge branch 'master' of https://github.com/fionaluo/FinalProject

Conflicts:
	lecture1.shtml
Width adjustment
text
Merge branch 'master' of https://github.com/fionaluo/FinalProject

Conflicts:
	css/style.css
	inc/footer.inc
	project.shtml