Merge remote-tracking branch 'origin/Cole'
Progression is now saved properly
Merge branch 'master' of https://github.com/siketh/COP4331_Project
Fixed pausing to actually work
Pause Menu implementation
Increased Tower Sprite from 64x64 to 100x100
Merge branch 'master' of https://github.com/siketh/COP4331_Project

Conflicts:
	TowerDefense-desktop/data/user-progress.xml
	TowerDefense/src/com/group23/towerdefense/screen/GameplayScreen.java
	TowerDefense/src/com/group23/towerdefense/screen/LevelSelectScreen.java
Merge branch 'master' of https://github.com/siketh/COP4331_Project
Upgrade buttons now 80x80
Pause menu integration
Merge branch 'master' of https://github.com/siketh/COP4331_Project
Mute button working
Merge remote-tracking branch 'origin/master' into Cole
Merge remote-tracking branch 'origin/Cole'
Merge remote-tracking branch 'origin/master' into Cole