cuda part 1
Merge branch 'master' of gitrepos:cs40s13
Merge branch 'master' into working