changed and unchanged the default gravatar icon, so nothing here
changes in log and db. removed Gemfile.lock from tracking
Basic profile complete
added user's name to the nav bar and rearranged items to pull to the right
merged conflicts
Fixed profile page
merge
moved edit account button off of navbar and onto the user's profile page.  the user's name on the navbar now links to that user's profile page.
removed Gemfile.lock from gitignore, since heroku wants that
commiting this for heroku
moved carousel into new file and added a welcome page with Reciplease description to the main page
moved carousel back into index. it now only appears when logged in
separated the logged in home and welcome page into 2 files and changed routing logic to handle it.  fixed image3 on the carousel :)
Test
added large login button to welcome screen
Merge branch 'master' of https://github.com/robwagner33/Reciplease
Merge branch 'recipe-model' of https://github.com/robwagner33/Reciplease