Merge pull request #3 from torijule/Forms

Forms
Merge pull request #4 from torijule/Forms

Adding customer care
main.css update-Jessica
add background img
css change
change the layout, main js file and index
add logo, edit menu.js
Merge pull request #5 from torijule/map

Map
Update main.css
Update index.html
css, add img, index
fix menu.js
edit
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/menu.js
commit
commit
test
test
Merge branch 'ray'
Merge pull request #2 from torijule/map

test