Added the gitignore file
Merge branch 'live' into dev