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

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

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

Conflicts:
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
	Library/expandedItems
Finally back up to date
Stashing
Commit.
Merge branch 'master' of https://github.com/race122/UOP-Gamejam-2014

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

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

Conflicts:
	Library/CurrentLayout.dwlt
Merge pull request #56 from floorman/master

Commit
pull