Adds password encryption, though not fully implemented
Merge branch 'master' into user_fucntionality

Conflicts:
	app/models/user.rb
Adds functional bcrypt gem for user password.

Like a fox.
Functional bcrypt with redirect to login page upon failed login...

Like a fox.
?
Merge branch 'master' into Bcrypt
Merge pull request #9 from jonathanpeterwu/Bcrypt

Bcrypt


![asdas](http://giphy.com/static/img/appicons/giphytv.gif)