lol
lol
lol
lol
Pouvouirs Implementees
Pouvouirs Implementees
Merge origin/master

Conflicts:
	crystal-crush/public_html/js/GamePanel.js
	crystal-crush/public_html/js/ScorePanel.js
Merge origin/master

Conflicts:
	crystal-crush/public_html/js/GamePanel.js
	crystal-crush/public_html/js/ScorePanel.js
	crystal-crush/public_html/js/variables.js
Merge origin/master

Conflicts:
	crystal-crush/public_html/js/ScorePanel.js
	crystal-crush/public_html/js/variables.js
Superpouvoirs
Merge origin/master

Conflicts:
	crystal-crush/public_html/js/ScorePanel.js
Lol