Twitter challenge
Merge branch 'master' of github.com:sguha00/rails-twitter-challenge

Conflicts:
	.gitignore