countdown
Merge branch 'master' of https://github.com/Grapheme/splat_innova_promises

Conflicts:
	app/views/templates/site/footer.blade.php