Stupid R.java is stupid
Merge branch 'master' of https://github.com/jposton2/cs326