gallery stuff
Merge remote-tracking branch 'brodieaustin/master'