modified:   README.md
	modified:   lol.sh
Merge branch 'master' of https://github.com/jupiter126/lol

Conflicts:
	README.md

	modified:   README.md