working web service
Merge remote-tracking branch 'upstream/master'
lakjdf
adding webserervice
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/views/users/index.html.erb