committing to pull
Merge branch 'master' of https://github.com/caseygrote/menuhello

Conflicts:
	main.cpp