Remove /bin /gen
Merge branch 'master' of https://github.com/nlubczynski/SchoolWork.git

Conflicts:
	3350Y/DiscountCalculator/.classpath