validation
more validation
Merge pull request #5 from vertigokidd/navigation

Navigation
.
validation
.
Merge pull request #7 from vertigokidd/new_branch_name

New branch name
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
Merge branch 'master' of https://github.com/vertigokidd/flashcards into navigation

Conflicts:
	app/controllers/index.rb