Added error handling for video, and restructured to allow other videos to be played.
Merge branch 'master' of github.com:DiscoBizzle/Ghost-Simulator

Conflicts:
	gslib/game.py
	movie.mpg
	movies/movie.mpg
	video/default.mpg
Merge branch 'master' of github.com:DiscoBizzle/Ghost-Simulator

Conflicts:
	gslib/game.py
Merge branch 'master' of github.com:DiscoBizzle/Ghost-Simulator
Merge branch 'master' of github.com:DiscoBizzle/Ghost-Simulator