Added stuff to user form and stuff
Merge branch 'master' of https://github.com/benaduggan/pickadate

Conflicts:
	app/models/user.rb
here is everything