added method to hit for query
Merge branch 'master' of github.com:teddythetwig/cis400

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