woo(t)
Merge branch 'master' of https://github.com/rascheel/Cpre388Lab7

Conflicts:
	src/com/example/mymediaplayer/MyMediaPlayerActivity.java