Jimmy
Merge branch 'master' of https://github.com/nmlab-Group1/TurnTheTide_Public

Conflicts:
	TurnTheTide/TTTPlayerView.h
	TurnTheTide/TTTPlayerView.m