updated .gitignore
Merge branch 'live'