added top menu (partially)
Merge remote-tracking branch 'origin/master' into Italo's
Merge remote-tracking branch 'origin/master' into Italo's
Merge branch 'master' of https://github.com/siketh/COP4331_Project

Conflicts:
	TowerDefense/src/com/group23/TowerDefense/Enemy/Enemy.java
	TowerDefense/src/com/group23/TowerDefense/Level/Level.java
Refactored Wave generation to be more polymorphic
Fixed bugs so that it is up to modern version
Made Level abstract and moved the sample level into Level1