Conflicts:
	Emily_Martinez/Travel.html
page margins
add image
test 2
height changes
Images b&w
Font color