no actual changes, switch over to new branch to update bug fixes
added an else to HomeController show method and changed root to redirect to home#show
home goes to welcome page from topnav
Merge pull request #60 from lighthouse-labs/feature/96-root-path-bug

added an else to HomeController show method
Merge pull request #57 from lighthouse-labs/feature/55-custom-avatar-uploader

Feature/55 custom avatar uploader
Merge branch 'master' into feature/89-student-contact-wall
Updating branch