Added all the things
Updates for deployment
Merge remote and local
Merge remote and local merge .gitignore