removed some unnecessaries from base
Merge branch 'master' of https://github.com/OSUOSC/sharklightning-hackathon