j;jk'

joi;hjiko'
111111111111

22222222222222
11

222
111
20140414
222
Merge branch 'master' of https://github.com/qq913533195/Notes

Conflicts:
	README.md
merge with lucifer