Combined code
Merge branch 'master' of https://github.com/poejreed/secAudit

Conflicts:
	main.cpp