init
Merge branch 'master' of https://github.com/bitjjj/SocialTokenAutoComplete.git

Conflicts:
	.gitignore