Fix err.
Fix error
Merge branch 'master' of https://github.com/not001praween001/MYMAP_enpit into not001praween001-master
Fix error
Merge branch 'not001praween001-master'
Fix error
Merge branch 'master' of github.com:Olivia-tou/MYMAP_enpit

Conflicts:
	app/views/welcome/index.html.erb