Fixing wrongly merged branch problem
Merge branch 'master' of github.com:chrisdfe/Indie-d

Conflicts:
	app/assets/javascripts/views/game_ratings.js.coffee
	app/assets/stylesheets/users.css.scss
	app/views/users/show.html.erb
	app/views/users/show/_user_game_stats.html.erb
	app/views/users/show/_user_owned_genres.html.erb