#1 Add standard main parameters
Merge branch 'master' of git@github.com:gmazurkiewicz/discovery.git

Conflicts:
	main.cpp