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

Conflicts:
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
Added friction to player class
Merge pull request #38 from floorman/master

No real changes, told to push
stashing
Merge pull request #39 from Kierz/master

friction added to player class
Merge branch 'master' of https://github.com/race122/UOP-Gamejam-2014

Conflicts:
	Assets/Scenes/RinkMain.unity
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
	UOP-Gamejam-2014-csharp.sln
	UOP-Gamejam-2014.sln
Worked on gameplay so friction and force balance nicely
stashed
Worked on gameplay so friction and force balance nicely
Merge pull request #41 from Kierz/master

gameplay changes
Commit.
Create README.md
Merge branch 'master' of https://github.com/race122/UOP-Gamejam-2014

Conflicts:
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
	ProjectSettings/EditorBuildSettings.asset
Merge branch 'master' of https://github.com/race122/UOP-Gamejam-2014
Added menu title.
COmmit, nothing changed.
Player shot gets disqualified if they run past the hog-line
Fixed a bug where stones could not be fired again if disqualified
changed camera angles, friction values, speed of player and momentum