Merge branch 'view' of https://github.com/kunovsky/flash_cards_group_project into models/migrations/seed
Merge branch 'e_j_controller' of https://github.com/kunovsky/flash_cards_group_project into models/migrations/seed
pulling from jake and elaine branch

Merge branch 'e_j_controller' of https://github.com/kunovsky/flash_cards_group_project into models/migrations/seed
pulling from alex views

Merge branch 'view' of https://github.com/kunovsky/flash_cards_group_project into models/migrations/seed
Pulling from Jake and Elaine Controller!

Merge branch 'e_j_controller' of https://github.com/kunovsky/flash_cards_group_project into models/migrations/seed
you're a wonderful man
Merge branch 'view' of https://github.com/kunovsky/flash_cards_group_project into models/migrations/seed
.
yes
pulling down the master branch to work on

Merge branch 'master' of https://github.com/kunovsky/flash_cards_group_project into controllers
breaking into diff routes
Pulling from e_j_controller
Merge branch 'e_j_controller' of https://github.com/kunovsky/flash_cards_group_project into controllers
.
Working version of the guessing page
Merge pull request #4 from kunovsky/controllers

Controllers