validation
more validation
.
Merge remote-tracking branch 'origin/master', conflicts resolved

Conflicts:
	app/controllers/index.rb
	app/models/user.rb
Merge pull request #6 from vertigokidd/models

Models