Left merge conflicts in gemfile.lock
Merge branch 'merthyr' of github.com:sdc/leap into merthyr
Merge branch 'merthyr' of github.com:sdc/leap into merthyr
Jruby for merthyr
Merge branch 'merthyr' of github.com:sdc/leap into merthyr
Added precompiled assets which don't want to compile on windows