Preparing for merge with most recent updates
Fixed merge conflicts
Added to gitignore