Adding type metadata to settings
Merge branch 'master' of github.com:dsstutts/ARDLIB

Conflicts:
	lib/types.h