rearranged user route positions in file
fixed user routes
Merge branch 'group2_master' of https://github.com/jnorton77/web-flash-cards-1-multiple-decks-challenge into group2_master

Conflicts:
	source/flashcards/app/views/users/edit.erb