Ignore lock and pbxproj files
Merge branch 'master' of github.com:stanleynwang/furry-octo-tyrion