updated from repo
Merge branch 'master' of https://github.com/Riverside-City-College-Computer-Science/CSC17a_Spring_2014_42448