Added National Instruments Service Locator URL
Merge branch 'nisl_test' of https://github.com/RealRancor/nikto into RealRancor-nisl_test
Resolve conflict

Conflicts:
	program/databases/db_tests