Testing jquery
merge changes into my branch
Merge branch 'master' into jahsie
Updates to the main page and style, add the about us and careers
added bad javascript. Overwrite with master js
update the html more styling to come
toggle form
merging master in brigitta