submodule tick
Merge remote-tracking branch 'decko/master'
corrected mod Gemfile path
Merge remote-tracking branch 'wagn/master'