first commit
Merge branch 'master' of github.com:littleq0903/social-upload

Conflicts:
	.gitignore