Merge pull request #1 from dgalaktionov/master

Subidos harxibos que nos dieron
Merge pull request #2 from dgalaktionov/master

Doing stuff
Deleted
Merge branch 'master' of https://github.com/dgalaktionov/Aleph into dgalaktionov-master

Conflicts:
	main.py
Merge pull request #6 from dgalaktionov/master

Made some rusty and ugly collision with the background.
Added some Tiles for maps
Merge pull request #7 from dgalaktionov/master

Fixed some collision bugs.
Merge pull request #10 from IagoLast/master

Added some Tiles for maps
added samplemap
Added some placeholder classes.
Merge branch 'master' of https://github.com/stbnps/Aleph
Merge pull request #11 from hmourit/master

Added some template classes
Done some refactoring. Now there's one file per class, and it's more
compliant with our design. Classes Map and GUI are still pending.

Also, fixed the camera AND collision stuff.