Libraries
Merge branch 'develop' of https://github.com/sp-oriol-prat/SPGJ1 into develop

# By Oriol Prat
# Via Oriol Prat
* 'develop' of https://github.com/sp-oriol-prat/SPGJ1:
  * stop tracking some files
  * add enemy in scene
  * enemies first commit
  * moved some more things
  * moved some things

Conflicts:
	unity/Temp/__EditModeScene
	unity/unity.userprefs