initial short asg check in
Merge https://github.com/ronan8901/COS375Spring2013ShortAsgSCM