First commit
Merge github.com:bmailhe/memento

I need to merge because I did not pull before