qdfg
qdfgMerge branch 'master' of https://github.com/celko/funmanProject

Conflicts:
	Application.hpp