Add hello as testing for git upstream push
I'd like Jess' latest and greatest things.

Merge branch 'master' of https://github.com/thejessleigh/sinatra-flash-cards-master
Jess have such nice things.

Merge branch 'master' of https://github.com/thejessleigh/sinatra-flash-cards-master
Incorporating latest additions from Jess

Merge branch 'master' of https://github.com/thejessleigh/sinatra-flash-cards-master
Add BCrypt to user model
Encrypt user password before storing.

Include BCrypt-ruby gem. Incorporate BCrypt::Password function in the seed file to hash password.
Pulling in basic flash card game features.

Merge branch 'master' of https://github.com/thejessleigh/sinatra-flash-cards-master
Remove old user seed without encrypted password.

Princess Leila is a threat to the evil empire.
We want to be able to log in

We can log in now.
People need to be able to log in and sign up.

Added the ability to log in and sign up.
User needs to be able to log out

We added a logout route, because the user needs to be able to
log out. We also added an if statement to the home page so we can see
if we are logged in or not.
Implement logout route

User should be able to log themselves out.
Preparing to integrate users with flashcard game

first, we are pulling in the flashcard game.

There were merge conficts where these two features fit together.

1. In the index view, added a part greets a user if they are logged in. Also redefined the sign-up route, which caued a conflict.
2. In the controllers user/rb, changed teh login to use actual authentication instead of dummy authentication.
3. In the index.rb, don't remeber what the confict was.

Merge branch 'master' of https://github.com/thejessleigh/sinatra-flash-cards-master

Conflicts:
	app/controllers/index.rb
	app/controllers/user.rb
	app/views/index.erb
Users can log in, log out, and go to index page

Successfully made it so that it will not let you past the index page
if you do not have an account.
logout links now point to the right route

The logout links were pointing to /log_out when the actual route
was /user/logout. So I fixed the links.
fixed merge conflict for logouts.
can now add multiple cards to a deck.