resolve conflicts
Merge branch 'master' of https://github.com/lildesert/JayFouNetWork.git