Updated basis functions so they only return ints
Properly compute std. deviation
Merge branch 'master' of https://github.com/rhedshi/cs181-final-project