old laptop

add 1 line, conflict?
Merge branch 'origin/dev-info' into dev-info

Conflicts:
	DeveloperInfo.md