Merge pull request #6 from rantoniops/cassie

Cassie
fixed association problem with source:deck
fix merge conflicts
merge branch 'master' of https://github.com/rantoniops/flashcards_group_project

Conflicts:
	db/migrate/20140718112359_create_rounds.rb
added play_game button to user_profile
Merge pull request #8 from rantoniops/alan

added play_game button to user_profile
added choose_deck radio buttons to choose_game VIEW
Merge pull request #9 from rantoniops/alan

added choose_deck radio buttons to choose_game VIEW
test-deck.erb communicates deck to new/round controller (but not yet user)
Merge pull request #10 from rantoniops/alan

test-deck.erb communicates deck to new/round controller (but not yet use...
go smoothly from login to single card
Merge pull request #11 from rantoniops/alan

go smoothly from login to single card
it works, from login to score screen
Merge pull request #12 from rantoniops/alan

it works, from login to score screen
seed core group as users
Merge pull request #13 from rantoniops/alan

seed core group as users
removed index files
Merge pull request #14 from rantoniops/alan

removed index files
added logout feature
Merge pull request #15 from rantoniops/alan

added logout feature