shell assignment 2
Merge branch 'staggin'