Added implementation UML and Meeting Agenda for Groupmeeting 6
updated gitignore
Created gameFactory and its methods
Update scorescreen constructor
updated MainMenuscreen constructor
Removed carouselModel and moved its attribute to carouselscreen
updated armory constructors
Replaced WarUtility with AbstractArmoryItem and added implementation
Refactored Game classes to create gamescreen from factory
fixed carousel bugg
Added AbstractDefenseArmoryItem, AbstractEffectArmoryItem and AbstractProjectileArmoryItem all with implementation of method act()
Added class Upgrade with implementation
Added ArrayLists of AbstractArmoryItem to ArmoryScreen
Fixed MergeConflict

Conflicts:

	MeteorDefense/src/com/esnefedroetem/meteordefense/screen/ArmoryScreen.java
Changed name and icon of the app on android
Removed Player class and moved Wallet to model package
Moved caculation code in shoot() to calculateAngle() in class CannonBarrel
Implemented propertyChange() in GameModel to react to events from ArmoryItems
Added some temporary implementetation to shoot() in GameModel
Changed methodnames to execute() in AbstractDefenseArmoryItem and AbstractEffectArmoryItem