file for all!
Merge commit 'a03aa18e2568c7e23ca21d82e6b37663e7cf6785'

Conflicts:
	main.cpp