finalised javascript
Merge branch 'front_end' of github.com:IanHumin/rezzo-rails