added :age, :name to user model because they suddenly and inexplicably went missing....
more minor css changes
minor chages to merge in keithfeature branch
Merge branch 'keithfeature' into dev

Conflicts:
	app/assets/stylesheets/application.css
	app/assets/stylesheets/parties.css.scss
	app/views/layouts/application.html.erb
	app/views/parties/index.html.erb
readding search box, floats right