Merge pull request from Zerrien/master

Adds Josh C's image and updates the about page.
This commit is contained in:
Nick Winter 2015-11-10 13:58:10 -08:00
commit 5e4fccf775
2 changed files with 2 additions and 2 deletions
app
assets/images/pages/about
templates

Binary file not shown.

After

(image error) Size: 11 KiB

View file

@ -184,8 +184,8 @@ block content
| Compiler Engineer
p(data-i18n="about.rob_blurb")
| Codes things and stuff.
img(src="/images/pages/about/placeholder.png").img-thumbnail
img(src="/images/pages/about/josh_c_small.png").img-thumbnail
.team_bio
h4.team_name
| Josh Callebaut