Merge branch 'master' of https://github.com/svenoaks/resume-bootstrap

Conflicts:
.idea/workspace.xml
fix