Added users controller
Merge pull request #2 from Jessica-L/andy_G

Added users controller
Delete README.md
Update Readme.doc
Merge branch 'master' into calendar-stuff

Conflicts:
	config/routes.rb