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
pulling down the master branch to work on

Merge branch 'master' of https://github.com/kunovsky/flash_cards_group_project into controllers
Pulling from e_j_controller
Merge branch 'e_j_controller' of https://github.com/kunovsky/flash_cards_group_project into controllers
two new helper methods
some helpers
.
Working version of the guessing page
in order to pull
..
Pulling Ty Changes
Merge branch 'controllers' of https://github.com/kunovsky/flash_cards_group_project into e_j_controller
Merge pull request #4 from kunovsky/controllers

Controllers
Merge pull request #5 from kunovsky/e_j_controller

modified user.rb's
Merge pull request #6 from kunovsky/stats

Stats
Pulling Master after merge party.

Merge branch 'master' of https://github.com/kunovsky/flash_cards_group_project into e_j_controller
working mvp...sort of