Removed unused directory .DS_Store
Ignoring not needed directory
Fixing page error
Merge with master