merging
merging
Merge branch 'master' of https://github.com/victorsauri/reFusion_rails_v2
working javascript