stuff
Merge remote-tracking branch 'sbonner1/master'
fixed R.java file