added index.html.erb
Initial commit
Merged with users
session routes
conflict
users updated