Fixed variable issue
standard commit will be overridden by git cloud
Merge branch 'master' of https://github.com/tlwirtz/SoundersApp_1

Conflicts:
	app/assets/images/64x64.png
	app/views/shared/_first_rank.html.erb
	app/views/shared/_gather_tweets.html.erb
	app/views/shared/_player_info.html.erb
	app/views/shared/_player_list.html.erb
	app/views/shared/_runner_up.html.erb
	app/views/shared/_tweet_stats.html.erb
Merge remote-tracking branch 'origin/Formatting'
merge