integrating server into app
Merge branch 'master' of https://github.com/dkellis42/RPS_App

Conflicts:
	views/signin.erb
	views/signup.erb