Final version

This is the final working version for week 2 assignment