Revert "stage3"

This reverts commit 567684d931c77d1cf370a2f03ebe7d7779d570e7.
Merge branch 'master' of https://github.com/AminHuang/Agenda