init repository
Merge branch 'master' of github.com:guochunyi/twitter_project

Conflicts:
	.gitignore