added contact form
added javascript
renamed js
foo
foo
Merge branch 'contact'