Changes from live
Updated gitignore