Merge branch 'master' into 'master'

Merge partie 2

Closes #28

See merge request !8

src/.import/1659875.jpg-d57fa97a5a4f55d5507c394304b6f4d5.md5

+source_md5="39f4d26615403a507d6063e1fc280c9a"
+dest_md5="ed8585ac39f302709b70cdd97c52ef79"
+

src/.import/Amulette.png-33540e7dac9e93cdbbbb4f283d15b318.md5

+source_md5="395f1dea1e9be9be851bd308e2cb6cc8"
+dest_md5="e834cfed44af1f812c9e69c7b9fe96b9"
+

src/.import/button_normal.png-f376567a3df1a84325defde7c218828e.md5

+source_md5="4b8a3d41e8131c66a18035c9acd42cd0"
+dest_md5="cdb483b87c39b92fe52121686dc2fe0e"
+

src/.import/button_pressed.png-811e9e04158954ddb9dd6abbc8c5ac08.md5

+source_md5="eb7a77fef42fbf4218ec1f3f27613c03"
+dest_md5="e226c5a8f508ae0c9a03f3445129b715"
+

src/.import/carbon_button_normal.png-06b76c2035c7084d8ff3587d4ff1a5fc.md5

+source_md5="54d819af1d287a30a272f747457de5a0"
+dest_md5="d4585f5b563018ca338ac4e76428119b"
+

src/.import/carbon_button_pressed.png-4437576576065b0e281f0760eb29dea0.md5

+source_md5="3156adde86b43f575a6471f1c3de5702"
+dest_md5="b6ca2b0350f5eec6893d1ce0eeaf40b8"
+

src/.import/carbone_normal.png-54e3611714f0f6db9432ce7dde746223.md5

+source_md5="e61b813ca9d9d82f60f275355ae8b4dd"
+dest_md5="c434aafc0cfeed7de0ba1d19711e0824"
+

src/.import/carbone_pressed.png-ac07a8bee97a565ab3b3bd442fcdc309.md5

+source_md5="848bf9587463656cf358c58869a07049"
+dest_md5="47d31bff4b212e248794aeef3f64c41d"
+

src/.import/courbe_carbone.png-d075b387a7ffe403588b96098ea43534.md5

+source_md5="9f709331a133e641a4e0ab7bf6d3bc87"
+dest_md5="9ff72fc8869bc2f59bbe67e1dbbf3c3a"
+

src/.import/ecran_carbone.png-b8b14175908d1fea7ac9887ae1a18c1d.md5

+source_md5="3e6a97563a7673b45341f181ff3a23b9"
+dest_md5="3d1be375bd6c69550067a40e44fd98fe"
+