changing token
Merge branch 'master' of https://github.com/connormccutcheon/apicon

Conflicts:
	getty.php