adding modules to master
Merge branch 'Linnea'
trying to get rid of DS_Store files
Adding module for Vidushi
Adding correct gitignore
Ignoring default.settings.php
Fixing things
fixing things