Merge branch 'developer' into feature/Controller

# Conflicts:
#	CrystalPoint.cpp
#	Player.cpp

Player.h

@@ -6,6 +6,7 @@ class Player
 {
 private:
 	static Player* instance;
+	void levelUp();
 public:
 	Player();
 	~Player();
@@ -23,10 +24,14 @@ public:
 	Weapon* leftWeapon;
 	Weapon* rightWeapon;
 
-	float health;
-	float xp;
+	float health, maxHp;
+	float xp, maxXp;
 	int level;
 	int crystals;
 
 	float speed;
+
+	void HpUp(int);
+	void HpDown(int);
+	void XpUp(int);
 };