Solved merge conflicts with header
Restyled the login and signin pages
Add star ratings and fix small bugs
Change 'Add Resource' button back to link
Restyled the edit user page
Fixed merge conflicts in header
Fixed merge conflicts in custom.css file
Restyled resource index filter
Add more info to user profile page and fix small bugs
Switch from Mandrill to Postmark
Started restyling user show page
Started restyling resource show page
Fixed merge conflicts in review partial and user show page
fixing search
Fixing Search, Search UI
Add cost_to_display helper and update sample_rake to assign decimals instead of integers to cost
Merge branch 'master' of https://github.com/TylerSangster/frog_log
Restyling resource index
Merged conflicts in header and resource index partial
Restyling resource index page