PHP stuff
Merge branch 'master' of github.com:indraneel/Celebrity
Tokens work hopefully