README update
Merge branch 'master' of github.com:Derikulous/twitter_rails

Conflicts:
	README.md