Update README.md
Update README.md
Merge pull request #9 from Kierz/master

Merge #3
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?
Commit.
Merge branch 'master' of https://github.com/race122/UOP-Gamejam-2014

Conflicts:
	Library/CurrentLayout.dwlt
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
trying to merge
trying to merge
trying to merge
Commit.
Commit.
Update README.md
trying to merge
Kierz and I fixed a bug where the camera rotations would sometimes get messed up
Merge branch 'master' of github.com:race122/UOP-Gamejam-2014

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

More bug fixes
trying to merge