Funnel updates
Merge branch 'master' of https://github.com/natejackels/DisappointingProject

Conflicts:
	src/VLC.java