hopefully this cleans stuff up
Merge https://github.com/EricOng/CS149SJSU

Apparently forgot to pull, hope this doesn't break stuff =D