signin signup added functionality (no repeating users)
resolved merge issues in app.rb