js for employees and style.css
Merge branch 'master' of https://github.com/mattisbodtker/ADD-site

Conflicts:
	compass_app_log.txt