Contact page added
Merge branch 'master' of https://github.com/CS370-soft-eng-practicum/Postcard

Conflicts:
	assets/css/style.css
Merge branch 'master' of https://github.com/CS370-soft-eng-practicum/Postcard