removed ds_store
Merge branch 'master' of https://github.com/slapner/meeting-rooms