big update, stuff
Merge branch 'master' of github.com:lbrentcarpenter/twitter

Conflicts:
	.gitignore