delete
Merge branch 'easytrip' of https://github.com/Zuohr/flweekr.git into
easytrip

Conflicts:
	flweekr/src/pentagon/model/Meta.java