Opened Unity project, and ran the game so far. In doing so, numerous metadata files were added.
Merge branch 'master' of https://github.com/Retro11231/Joust
Merged - used Dan's updates when there were conflicts
Conflicts:
	Joust/Library/CurrentLayout.dwlt
	Joust/Library/assetDatabase3
	Joust/Library/expandedItems
	Joust/Library/guidmapper
	Joust/Library/metadata/66/664fb01328d2fdd43987e4dd3a9cb838
Merge branch 'master' of https://github.com/Retro11231/Joust
Small change to Player.cs to change jump to happen on key press, not key hold.

Signed-off-by: flippicat <12bennettp@gmail.com>