Add DS_Store to irgnore file
Merge branch 'master' of github.com:hackmcgill/hack_mcgill