teleport disc incomplete
Merge branch 'master' of github.com:jobob2992/flyboy

Conflicts:
	Player.cpp
	Player.h
syncing night before 2nd playtest
about to render disc
moving disc