Gitignore
Micah's changes
Fixing merge conflict