Gravatar
Merge branch 'master' of https://github.com/britneyroar/twatter

Conflicts:
	app/views/index.erb
Merge pull request #18 from britneyroar/solved_conflicts

Solved conflicts
Merge branch 'master' of https://github.com/britneyroar/twatter into tweet_time

Conflicts:
	app/views/index.erb