First Update
Merge https://github.com/skTzoOoTech/ativitylog

Conflicts:
	README.md