r.java not working?
Merge branch 'master' of https://github.com/JakenHerman/Introductory-Android-Assignment

Conflicts:
	app/src/main/java/com/example/jaken/hello_world/DisplayMessageActivity.java