adding lab 2 stuff
Merge branch 'Carlos_Branch'