change to show
resolve merge conflict
homepage changes
merge master branch
home page icon row
Merge branch 'master' into paul
home page styling
saturday morning commit
merge conflicts
resolve merge conflict with local master
style updates to make room for photo fields
add styling for login page
minor styling changes
order view pages
Merge pull request #23 from vivekmshah/paul

Paul
most of authentication finished
tried implementing imagemagick but undid the changes
edits to application.rb and production.rb for heroku db and minor syntax corrections to stylesheet
take out dog image for quick test
put dog image back in with an updated file path in stylesheet