linkfix
Merge branch 'master' of https://github.com/niklasmeyer/my-standard-bootstrap-project