hello

logo
Merge branch 'master' of https://github.com/NuclearDisaster/AutomatedSequence

Conflicts:
	build/classes/automatedsequence/gui/Properties.class