removed * border
removed * border
Merge branch 'Dev' of github.com:emorygriffith/Spiked into Dev
Merge branch 'Dev' into maxdev
added Andrews menu sripts
re arraged menu stuff
nothing
fixed main.js merge error
merged maxdev with Dev