adding in rails, integrating with prev changes and added oauth support
Merge branch 'master' of https://github.com/hendychua/3213-hw4