Adding Tweet model
Finishing first test
Fix Merge conflict
Merge branch 'master' into tweet-model
moderators can delete
Pushing branch
Merge branch 'master' into tweet-model

Conflicts:
	spec/factories/user.rb
Merge branch 'tweet-model'