Commented out SharedPreferences code in ChooseSkillsActivity.java
Change button colors when pushed in ChangeSkillsActivity
Merge branch 'master' into button_color