Edited the homepage copy
Removed the conflicting .DS_STORE files
Merge remote-tracking branch 'origin/dev' into dev