Merge branch 'master' of...

Merge branch 'master' of https://git.unistra.fr/m.a.t.h.s.-manieurs-de-l-avenir-technologique-des-humains-stup-faits/psychorientation

.gitignore

@@ -6,6 +6,7 @@
 *.user
 *.userosscache
 *.sln.docstates
+/.idea.psychorientation.dir/.idea/workspace.xml
 
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs