delete banana
Merge branch 'HEAD' of https://github.com/taloto07/falcon.git

Conflicts:
	FalconTowncar/WebContent/WEB-INF/templates/view.st