Merge remote-tracking branch 'origin/master'

Conflicts:
	projects.md

Revert "a"

This reverts commit
2062c3a695aa091c08d8f6064d5c22ce40322eff.

resume_now

Revert "resume"

This reverts commit
64809ba7b0fa622396a610aaeb28e738fc2d27aa.

resume