Made some changes to allow for user testing
Merge branch 'master' of https://github.com/natejackels/DisappointingProject

Conflicts:
	src/Funnel.java
Merge branch 'master' of https://github.com/natejackels/DisappointingProject