initial commit
Merge branch 'master' of github.com:ZestySalsa/zesty-tweet

Conflicts:
	.gitignore
gitignore