integrating new design
Merge remote-tracking branch 'upstream/master'
attempting to put all assets in the correct directories
trying to resolve assets
removed bootstrap and replaced login modal with vex which is much more lightweight
phil is making things look good