user is now required to enter values in the wizard
Merge pull request #4 from maxkohl88/wizard-clean-up

user is now required to enter values in the wizard
remove conflicts from user model for merge with master
add class constants for search and adv_search parameters
update strong params for user and search
first pass at user#index with search_params
tested param passing on index
more seed data
commentary on controller
more seed data
handle 'both' preferences in index action
users can be searched by min/max height and age
remove height from searchables
Merge branch 'user_index' of github.com:maxkohl88/all-my-circuits into user_index

Conflicts:
	app/models/user.rb