switched to rails 3.2.14
Merge branch 'master' of https://github.com/weyichen/cis196_weyichen