Initial Commit
Merge branch 'master' of https://github.com/tanmaygarg/ZapposFinal

Conflicts:
	src/com/example/zappos/DiscountChecker.java