dga
Merge branch 'master' of https://github.com/johnmcconnell/lifesights

Conflicts:
	README.md