Merge branch 'master' into develop
Changing some sounds around.

This commit also includes sounds for a magic gem clear,
which isn't implemented just yet.
Scoring and scoring-noises changes.
Changing window size to 640x480 for now.

Some debug output was also removed.
Changing the way scoring works. You can chain between pieces now!
Adding more combo clear colors. Rainbow!
Changing the way scoring works and adding some extra GameStates
Added level ups and gravity.
Merge branch 'develop'