changed full_name to profile_name in views. removed white border from footer
Merge pull request #34 from blairprophett/master

changed full_name to profile_name in views. removed white border from footer
a few more styling things
Merge pull request #35 from blairprophett/styling

a few more styling things
added carrierwave, image upload working locally, images showing on ffirndshipsindex, updated app controller to allow for account_update for devise users
Merge pull request #36 from blairprophett/image_upload

carrierwave working locally, app controller allows users to edit their account
s3 working with carrierwave
Merge pull request #37 from blairprophett/image_upload

s3 working with carrierwave
concluding merge
Merge branch 'stevenmiller888-master'
Merge pull request #39 from blairprophett/master

merging steven's changes
deleted folder
Merge pull request #40 from blairprophett/master

deleted folder