Merge pull request #2 from FuriousCatInteractive/mapMaster

Map master
je sais pas sa me fait chier
Merge remote-tracking branch 'origin/StevenDev'
Merge remote-tracking branch 'origin/stevenDev' into dev
Merge branch 'stevenDev' into dev
Le squelette fonce vers le joueur
début trigger zone arrivée
C'est bon on peu de nouveau tuer les squelette

Par contre les squelette peuvent toujours pas nous tuer
Le squelette peut aussi nous tuer maintenant.
Merge branch 'dev' into stevenDev
faut vraiment trouver comment éviter ça
Merge branch 'master' of https://github.com/FuriousCatInteractive/LeRetourD-Abargoch into dev

Conflicts:
	unity/Assets/RAIN/Editor/RAINSettings.asset
Merge branch 'dev' of https://github.com/FuriousCatInteractive/LeRetourD-Abargoch into dev
changement dans le gitignore
laver repo
remove *.userprefs
laver repo
Merge branch 'master' into dev

Conflicts:
	.gitignore
	unity/Assets/AI.meta
	unity/Assets/AI/Cache.meta
	unity/Assets/AI/Cache/BTEditorWindowState.asset
	unity/Assets/RAIN/Editor/RAINSettings.asset
	unity/Assets/RAIN/Editor/RAINSkin.asset
Merge branch 'dev' into stevenDev

Conflicts:
	.gitignore
	unity/Assets/Fantasy AI Free Edition/DUNGEON HORDES MINIGAME/Dungeon Hordes.unity
	unity/Assets/RAIN/Editor/RAINSettings.asset