Merge pull request #30 from Kierz/master

Merge #13
Addition of materials.
Merge branch 'master' of https://github.com/race122/UOP-Gamejam-2014

Conflicts:
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
Another attmpt at fixing update friction function