merge
Merge branch 'add_template' of https://github.com/Zuohr/flweekr.git into
add_template

Conflicts:
	flweekr/src/pentagon/controller/Controller.java