initial commit
Merge https://github.com/gordon4me/me