I think Chris missed some files when he committed. There are some files
that are auto populated when you change something in a different file.
Those have to committed too. I assume R.java and BuildConfig.java have
to be committed. so I am doing. Also ResultsActivity.java because I made
some changes.
some more changes. fixing naming conflicts.