Cleanup of an unsuccessful merge in gitignore
Cleanup of an unsuccessful merge in gitignore

I removed the R.java, since that will be in the gen folder, so should be ignored anyway. Removed the image too, looked weird there.
AdamRLukaitis/tango-examples-c,googlearchive/tango-examples-c,vamsirajendra/tango-examples-c,googlearchive/tango-examples-c,vamsirajendra/tango-examples-c,LorenzMeier/tango-examples-c,LorenzMeier/tango-examples-c,AdamRLukaitis/tango-examples-c,hamidb/tango-examples-c,lydhr/tango-examples-c,lydhr/tango-examples-c,brinkmwj/Fairies-Why-Did-It-Have-To-Be-Fairies,hamidb/tango-examples-c,brinkmwj/Fairies-Why-Did-It-Have-To-Be-Fairies