changes to bundle
merges PR changes
add test for main app layout, and add a layout in the spec/dummy app
Merge branch 'lovewithfood-inherit_from_action_controller_base'
update Gemfile.lock to rails 3.2.18
rail4 compatible first commit
rail4 compatible first commit
Merge branch 'rails4'
do not commit Gemfile.lock into version control
merge repo prior to pushing changes