Merge branch 'master' into addProjDataDef
Merge branch 'master' into addProjDataDef
preload images added
cleaned up carousel mixin a bit
cleaned up navbar mixin
FUUUUCKKK I HAD MULTIPLE BLOCKS IN MIXINS WORKING AND NOW I CAN'T FIGURE
OUT HOW TO GET THAT BACK!
giving up on having multiple blocks inside the carousel
Merge branch 'addProjDataDef'