Update .gitignore file
trying new .gitignore
Update gitignore
Remove photo uploaded, update css and add google map api under trip
Update merge conflicts