pulled cscie12
update
Merge branch 'master' of https://github.com/jhollist/cscie12