Initial commit
Merge branch 'master' of http://localhost:8080/git/bruno/teste

Conflicts:
	README.md
Merge branch 'master' of heroku.com:salty-spire-3721
Updating gems