working on crystals
Merge branch 'master' of https://github.com/JazzOut/Jazz.git

Conflicts:
	core/src/com/jazz/jazz/Level_3.java
	core/src/com/jazz/jazz/Levels.java