Final commit before demo
merge pictures