test for Assignment1.

shoud be working in your machine :)
Merge remote-tracking branch 'upstream/master'