freeze
bundle update rails
Merge branch 'master' of https://github.com/eseosa/school_window