merge
Merge branch 'team-ross' of https://github.com/dekhtyar/CSC366-Spring2013 into team-ross
Merge branch 'team-ross' of https://github.com/dekhtyar/CSC366-Spring2013 into team-ross

Conflicts:
	project/team-ross-soap.php
Merge branch 'team-ross' of https://github.com/dekhtyar/CSC366-Spring2013 into team-ross

Conflicts:
	project/team-ross-soap.php