Final version

Sent to Iveta at 12-13-13 0516PM
Added testing directory