Commiting All current cs215 (fall, 2013) work
Merge https://github.com/13djwright/CS215CPP