Merge branch 'sinatra' of github.com:mathiasarmstrong/Rock_paper_scissors into sinatra
added friends.erbfile
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