Merge pull request #31 from GJST-Capstone/stacy

not sure honestly, main.js showed as changed and unsaved
minor changes for space removal