.DS_Store banished!
Merge branch 'master' of https://github.com/SeansAssignments/assignment_01
Merge remote-tracking branch 'origin/master' into dev