playback stats
Merge branch 'master' of https://github.com/ul1994/414MP1

Conflicts:
	MP1/src/mp1/PipelineCreator.java
conflicts be gone