edited contact page to practice branching
more demoing merging from master
more demoing merging from lauren branch
Merge branch 'lauren'

Conflicts:
	app/views/pages/contact.html.erb

Manually merged the two files. Kept one of the edited lines.
changed the contact page back to how it was before demo.
Merge pull request #1 from lukru/lauren

Lauren