create users
Merge branch 'master' into fs-create-users

Conflicts:
	config/routes.rb
Merge pull request #2 from atsheehan/fs-create-users

create users