first
empresa created
Merge branch 'master' of github.com:fabriciobizotto/rails_twitter

Conflicts:
	.gitignore
	README.md