starting logic for menu
Merge branch 'Adam'

Conflicts:
	main.wire
Merge branch 'master' into Dustin