modified:   application/src/main/scala/com/paris7/mayorpro/presentation/graphic/Interface.scala
	modified:   application/src/main/scala/com/paris7/mayorpro/presentation/graphic/Palette.scala
	modified:   application/src/main/scala/com/paris7/mayorpro/presentation/graphic/paletteEngine.scala
Merge branch 'master' of https://github.com/ziellim/Mayor-Pro
	modified:   application/build.sbt
	new file:   application/build.sbt~
	modified:   application/src/main/scala/com/paris7/mayorpro/presentation/graphic/Interface.scala
	new file:   application/src/main/scala/com/paris7/mayorpro/presentation/graphic/Interface.scala~