Merge branch 'master' of https://github.com/chus1818/company_web

Conflicts:
	app/views/layouts/welcome.html.haml
Merge branch 'master' of https://github.com/chus1818/company_web