evil laugh
another local edit
Merge branch 'master' of github.com:jackfrozt/testGit

Conflicts:
	hi.txt
sexy 1st
T 1st
Merge branch 'Sexy'

Conflicts:
	hi.txt