Master ver. 1.3.2

-Layer collision added
-Not merged with the movement yet