Added next round button to EndOfRound script
pull from upstream
Pull from upstream
commit
pull
Merge pull request #57 from Kierz/master

more scrub issues
commit
commit
Merge pull request #58 from aidanoleary/master

Added next round button to EndOfRound screen
stashing
Fixes for animation.
Merge branch 'master' of https://github.com/race122/UOP-Gamejam-2014

Conflicts:
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	UOP-Gamejam-2014.userprefs
stashing
Fixed a lot of issues with the scrubbermovement.cs code, deleted the scrubbermovementR.cs as 2 scripts for the same thing is bad... also fixed order of player updates to avoid animation script errors. Also move the player scores so they are on screen now