testing
Merge github.com:cddiggs/CSCI4100_Spring12