temp commit
This is the functional countdown clock
Fixed conflicts, this should be in good shape

Conflicts:
	app/assets/javascripts/application.js
	app/assets/stylesheets/application.css
	app/controllers/entries_controller.rb
	app/controllers/promotions_controller.rb
	app/views/promotions/show.html.erb