merge before pull
added ds store to gitignore
added fix for subject area margins in ie8