resync with master
Merge branch 'master' of https://github.com/netelder/flashcardsp2

Conflicts:
	app/controllers/index.rb
build round.erb