shell assignment 3
Merge branch 'staggin'