edited typo
corrected merge conflit in application.css and application.js ruby file
changes
changes
styling in rails woo
changes
Merge pull request #14 from chinenyem/master

styling rails