creat pages scaffold
creat pages scaffold
Merge branch 'master' of github.com:mbaniasad/industrial_site

Conflicts:
	app/assets/stylesheets/application.css
modify menu_bar
modify menu