pushing shit
Merge branch 'master' of https://github.com/kalebdavis/Swen342DiningPhilosophers

Conflicts:
	bin/Philosopher.class