Merge pull request #1 from galmadar/test

Test
Update .gitignore
Update .gitignore
Update .gitignore
Update .gitignore
Merge pull request #2 from galmadar/galmadar

Galmadar
Merge branch 'master' of https://github.com/galmadar/trip-together
Update .gitignore
Update .gitignore
Merge branch 'master' of https://github.com/galmadar/trip-together into galmadar