adding friends.erm file and working on game.erb
Merge branch 'sinatra' of github.com:mathiasarmstrong/Rock_paper_scissors into sinatra
create app branch
Merge branch 'master' of https://github.com/mathiasarmstrong/Rock_paper_scissors into game
added the page fro games and styled it
added friends.erbfile
small change to css
add username and password to database
changed server erb file to match gideons
changed database to include username and password, with tests and change in class
Merge branch 'app' of https://github.com/mathiasarmstrong/Rock_paper_scissors into app

Conflicts:
	sinatra/app.rb
	sinatra/views/sign_in.erb
I merged gideons app file and my game file code
Merge pull request #24 from mathiasarmstrong/app

App
Merge branch 'friends' of https://github.com/mathiasarmstrong/Rock_paper_scissors into app

Conflicts:
	sinatra/app.rb
Merge pull request #25 from mathiasarmstrong/app

App
Merge pull request #26 from mathiasarmstrong/sinatra

Sinatra