stats implemented and user_name displayed in top right corner
merge conflish
Merge branch 'master' of https://github.com/christophwong/phase2-group-1-flashcard
damn merge conflict
Conflicts:
	flashcard/app/views/layout.erb
	flashcard/public/css/application.css