Fixed messed up directories
Merge branch 'extracurricular' of https://github.com/brendon-boldt/crazy-eights into extracurricular

Conflicts:
	Deck.java