vitrine

Merge branch 'generalised-features-and-shell' of gitlab.com:sicv/vitrine into… · 1c8b0fc2
```
Merge branch 'generalised-features-and-shell' of gitlab.com:sicv/vitrine into generalised-features-and-shell
```
murtaugh authored Mar 13, 2016
1c8b0fc2

Name	Last commit	Last update
collage		Loading commit data...
fonts		Loading commit data...
frames.examples		Loading commit data...
haarcascades		Loading commit data...
lib		Loading commit data...
scripts		Loading commit data...
test		Loading commit data...
text		Loading commit data...
.gitignore		Loading commit data...
404.html		Loading commit data...
500.html		Loading commit data...
NOTES.md		Loading commit data...
README.md		Loading commit data...
archive.all.json		Loading commit data...
archive.features.json		Loading commit data...
archive.html		Loading commit data...
archive.js		Loading commit data...
archive.json		Loading commit data...
archiveless.json		Loading commit data...
asger.json		Loading commit data...
blank.png		Loading commit data...
camera.html		Loading commit data...
camera.js		Loading commit data...
camera_new.js		Loading commit data...
cascadecollage.js		Loading commit data...
collage.html		Loading commit data...
collage.js		Loading commit data...
collage.shell.js		Loading commit data...
collage.spawntest.js		Loading commit data...
drawtest.js		Loading commit data...
erkki.json		Loading commit data...
erkki.reduced.json		Loading commit data...
folderfaces.py		Loading commit data...
index.html		Loading commit data...
jorn.all.json		Loading commit data...
jorncontours.json		Loading commit data...
jornmultiheads.json		Loading commit data...
makefile		Loading commit data...
poc.js		Loading commit data...
server.js		Loading commit data...
server_init.js		Loading commit data...
settings.example.json		Loading commit data...
standalone.js		Loading commit data...
styles.css		Loading commit data...
test-001.html		Loading commit data...
text.html		Loading commit data...

README.md