modified for study
Merge branch 'master' of https://github.com/yankeerunner/study

Conflicts:
	Git/studymemo.txt