with lines and labels
Merge branch 'master' of https://github.com/lucilley/CS3300Project1

Conflicts:
	philip.html
new commit
Merge branch 'master' of https://github.com/lucilley/CS3300Project1

Conflicts:
	philip.html