removed * border
removed * border
Merge branch 'Dev' of github.com:emorygriffith/Spiked into Dev
Merge branch 'Dev' into maxdev
added Andrews menu sripts
working on photos inside our story tab
re arraged menu stuff
playing around with photo grid
grid
nothing
fixed main.js merge error
merged maxdev with Dev
logo, styling