first commit
adding sinatra skeleton
Create schema
Update schema
committing logo -surveylogo.jpg-
Adding User.rb and users migration table
Added BCrypt to Gemfile and Environment
added styles and form to index, set up routes in index.rb for login/sigunp
Merge pull request #1 from jsuich/view_branch

added styles and form to index, set up routes in index.rb for login/sigu...
.
pulled mark's schema - adding changes to updated schema models and migration
doubling commit
added nav to layout
Merge pull request #2 from jsuich/user_branch

User branch
organized models to suit incoming data
Merge pull request #3 from jsuich/user_screen

organized models to suit incoming data
added survey list to user page, and user.erb for sign/signup
rebasing to master
Merge pull request #4 from jsuich/user_interface

added survey list to user page, and user.erb for sign/signup
.