Logo and data
logo
Merge branch 'master' of https://github.com/MadisKarli/TeamEdward.git

Conflicts:
	POS/src/ee/ut/math/tvt/teamedward/IntroUI.java
	POS/src/ee/ut/math/tvt/teamedward/PropertyValues.java