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