gitignore
floor colisions
gitignore
gitignore
Merge branch 'master' of https://github.com/oscargiol/-UPC--VJ--Videojoc-2D

Conflicts:
	.gitignore