pre-sync commit
merge required
Merge branch 'master' of https://github.com/FermentedRumptz/Burrito

Conflicts:
	Burrito/Burrito/Player.cs

Signed-off-by: nateyb93 <brownn15@up.edu>