work experience/education
Merge branch 'master' of https://github.com/lucilley/CS3300Project1

Conflicts:
	philip2.html