integrated ron's design
Merge pull request #23 from chorus-frogs-2014/rails_angular_integration

integrated ron's design