* unity project folder
First branche
* move unity project folder
* moved some things
* moved some more things
* enemies first commit
Players disparant projectile
Merge branch 'feature/playersShoting' into develop

* feature/playersShoting:
  Players disparant projectile
Merge branch 'develop' into feature/enemies

Conflicts:
	unity/Assets/Scripts.meta
* add enemy in scene
* stop tracking some files
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
Fxs
Character animations
Merge branch 'feature/fxs' into develop

* feature/fxs:
  Fxs Character animations
* enemies version (read from son and instantiated)
* deleting stuff?
Merge branch 'develop' into feature/enemies-manager

Conflicts:
	unity/Temp/bin/Debug/Assembly-CSharp.dll
	unity/Temp/bin/Debug/Assembly-CSharp.dll.mdb
Main menu added
Merge branch 'feature/main_menu' into develop

* feature/main_menu:
  Main menu added