changing color buttons
Merge branch 'master' of https://github.com/ihsane/McHack_Castaway

Conflicts:
	designatedTexterProject/.idea/gradle.xml
	designatedTexterProject/.idea/libraries/support_v4_19_0_1.xml
	designatedTexterProject/designatedTexter/build.gradle
	designatedTexterProject/designatedTexter/designatedTexter.iml
	designatedTexterProject/designatedTexter/src/main/java/com/example/designatedtexter/MainActivity.java
	designatedTexterProject/designatedTexter/src/main/res/layout/activity_main.xml
	designatedTexterProject/designatedTexterProject.iml
	designatedTexterProject/gradle/wrapper/gradle-wrapper.properties