adf
Merge branch 'master' of github.com:adriansosa/shopthisroom
code style changes in application.js