edit contact page with new formatting
Merge branch 'master' of github.com:cdangg/fashion_startup
Merge branch 'master' of github.com:cdangg/fashion_startup
fix conflicts in css after the merge