Added a gitignore file and removed files that shouldn't have been getting tracked.
Fixed merge problems.