add dotguy
Merge branch 'master' of https://github.com/calfjohn/StbProject

Conflicts:
	Classes/MaskLayer.cpp
	proj.ios_mac/stbProject.xcodeproj/project.pbxproj
Merge branch 'master' of https://github.com/calfjohn/StbProject

Conflicts:
	proj.ios_mac/stbProject.xcodeproj/project.pbxproj
edit moredetaillayer
Merge branch 'master' of https://github.com/calfjohn/StbProject

Conflicts:
	proj.android/jni/Android.mk
edit masklayer
Merge branch 'master' of https://github.com/calfjohn/StbProject

Conflicts:
	Classes/MaskLayer.cpp
	proj.ios_mac/stbProject.xcodeproj/project.pbxproj
Merge pull request #15 from encal/master

add dotguy~~~