Merge branch 'main' of https://github.com/Lonely-Horse/ServerMonitor

# Conflicts:
#	.gitignore
