added gitignore
merge commit
Merge branch 'master' of https://github.com/HypnoBeaverMoose/SEA

Conflicts:
	PlantGeneratorGUI/PlantGeneratorGUI/PlantGeneratorGUI.pro.user