Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/io/github/alshain01/Flags/metrics/Metrics.java