Stashing
Merge branch 'master' of github.com:race122/UOP-Gamejam-2014

Conflicts:
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
Stashing
Merge branch 'master' of github.com:race122/UOP-Gamejam-2014

Conflicts:
	Assets/Code/Player.cs
	Library/CurrentLayout.dwlt
	Library/InspectorExpandedItems.asset
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
Merge branch 'master' of github.com:race122/UOP-Gamejam-2014

Conflicts:
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
	Library/expandedItems
Backup-commit before things break
Made changed to counters
Commit
commit
merge
pull from upstream
Merge pull request #31 from Kierz/master

Merge #14
Update README.md
Update README.md
Update credits menu.
corrected merge conflicts
Merge branch 'master' of https://github.com/race122/UOP-Gamejam-2014
pull from upstream
Merge pull request #32 from aidanoleary/master

Changes made to round counters
Only the run animation plays for now