Added content and partial functionality to discounts.js
Added place-holder styles for discount divs
Merge branch 'master' of https://github.com/osmihi/Capstone

Conflicts:
	public/index.php