went back to first icon for login for time being
database setup
removed s error and added thin
Merge branch 'master' of github.com:andrewcallahan/codewithus
fix merge errors