Initial commit
second commit
Merge branch 'master' of https://github.com/dangerbird2/twitdemo

Conflicts:
	.gitignore
new file:   .gitignore