info on greg
Merge branch 'master' of https://github.com/datadave444/planets

Conflicts:
	scott.com