video bug fix
Merge branch 'seabert' of https://github.com/SeabertYu/576Project into
seabert

Conflicts:
	src/ImageIconMouseListener.java
	src/VideoPlayer.java
video player bug fixed