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
Merge pull request #32 from aidanoleary/master

Changes made to round counters
Only the run animation plays for now
Merge branch 'master' of github.com:race122/UOP-Gamejam-2014

Conflicts:
	Assets/Code/GameManager.cs
	Assets/Code/HudScript.cs
	Assets/Models/Materials/07 - Default.mat
	Assets/Models/Materials/07 - Default.mat.meta
	Assets/Models/Materials/08 - Default.mat
	Assets/Models/Materials/08 - Default.mat.meta
	Assets/Models/Materials/Mtl_hair01.mat
	Assets/Models/Materials/Mtl_hair01.mat.meta
	Assets/Models/Materials/ramsay_texture.mat
	Assets/Models/Materials/ramsay_texture.mat.meta
	Assets/Models/slide_anim.FBX
	Assets/Models/slide_anim.FBX.meta
	Assets/Scenes/DansTest.unity
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
Merge pull request #33 from floorman/master

Only the run animation works for now
stash
Fixed the import issue
Merge branch 'master' of github.com:race122/UOP-Gamejam-2014
Merge pull request #34 from floorman/master

Fixed the import issue
stash
stash
Main menu now goes to the correct scene on play
Merge branch 'master' of github.com:race122/UOP-Gamejam-2014
Merge pull request #35 from floorman/master

Main menu now goes to the correct scene
Merge.