Trebek says
Removed unneeded files
Merge branch 'master' into navigation, after resolving conflicts
Merge branch 'master' of https://github.com/vertigokidd/flashcards into navigation

Conflicts:
	app/controllers/index.rb
Merge pull request #8 from vertigokidd/navigation

Navigation