merged ios
Merge branch 'master' of github.com:S-Chan/Wildhacks