Merge branch 'master' of https://github.com/audibleblink/flashcardsv2 into user_migration
more css tweaks
Merge branch 'master' of https://github.com/audibleblink/flashcardsv2 into user_migration
association conflict
Merge branch 'master' of https://github.com/audibleblink/flashcardsv2 into user_migration
new round model - unfinished
Merge branch 'master' of https://github.com/audibleblink/flashcardsv2 into user_migration

Conflicts:
	app/views/results.erb
added fron graphic