finishing up gallery
finishing up gallery
merged some stuff and fixed blatant bugs... sorry for bad commit message haha
trying to pushgit add .
fixed merge conflcits
Merge pull request #2 from Eldwick/jamestest

Jamestest