porting changes from server, updated gitignore
merge conflict