merged
merged
Merge branch 'master' of
https://github.com/advancedrendering/project.git

Conflicts:
	ExtraBees/src/templates/MainTemplate.java