ex1 finished
Merge pull request #2 from jeth64/master

ex1 finished