Added SRTM.
Merge branch 'master' of github.com:roeles/maccready

Conflicts:
	references.bib
	technology/geomatic_services/geomatic_services.tex