Add company
Merge branch 'master' of https://github.com/eliu03/WelHair

Conflicts:
	src/www/static/css/backend/style.css