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

Conflicts:
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
Merge pull request #10 from floorman/master

Animations?