Kareem's Commit 11614
Merge branch 'master' of https://github.com/ajordan510/oddie

Conflicts:
	app/controllers/live_controller.rb