show travis icon form masterbranch
Merge pull request #23 from timoschilling/patch-1

show travis icon form master branch
Add Buildheroes Button, move both to top

Adds a Buildheroes link + @timoschilling's fixed Travis button.
Railsberry :triumph:

![Railsberry](http://www.railsberry.com/assets/2013/railsberry_european_conf.png)
Merge pull request #24 from moonglum/master

Railsberry :triumph: !!!!
Update captainhagbard.yml
Merge pull request #25 from timoschilling/patch-3

change web url of captainhagbard