Test to see if new gitIgnore is working
New .gitignore
gitignore changed, and project set up on justin's end, hopefully
R.java merge conflicts
Merging head, had to pick manually rewrite project.properties
new .gitignore for R files
You must remove files using git rm in order for them to be picked up by the new changes to .gitignore