ljk
Merge branch 'master' of https://github.com/likedan/NEWSATHacker

Conflicts:

NEWSATHacker.xcodeproj/project.xcworkspace/xcshareddata/NEWSATHacker.xcc
heckout