Merge pull request #1 from grizlee11/pull-request

Commit in pull-request branch.
Commit in master
Commit in pull-request
Merge branch 'master' into pull-request

Conflicts:
	main.cpp