Some changes and shit
Merge branch 'master' of https://github.com/lparkjordan/E205FinalProject