Choose Skills & Interests Shared Preferences feature
Merge branch 'choose-skills-and-interests-shared-prefs'
Merge branch 'master' of https://github.com/MFiesta/whatsyourstory

Conflicts:
	WhatsYourStory/app/src/main/AndroidManifest.xml

WhatsYourStory/app/src/main/java/com/example/si543/whatsyourstory/Choose
SkillsActivity.java

WhatsYourStory/app/src/main/java/com/example/si543/whatsyourstory/HomeAc
tivity.java

WhatsYourStory/app/src/main/java/com/example/si543/whatsyourstory/LogInA
ctivity.java

WhatsYourStory/app/src/main/java/com/example/si543/whatsyourstory/Messag
esListActivity.java

WhatsYourStory/app/src/main/java/com/example/si543/whatsyourstory/MyProf
ileActivity.java

WhatsYourStory/app/src/main/java/com/example/si543/whatsyourstory/SetMyI
nitProfileActivity.java
	WhatsYourStory/app/src/main/res/layout/activity_choose_interests.xml
	WhatsYourStory/app/src/main/res/layout/activity_choose_skills.xml
	WhatsYourStory/app/src/main/res/layout/activity_ind_msg.xml
	WhatsYourStory/app/src/main/res/layout/activity_messagelist.xml
	WhatsYourStory/app/src/main/res/layout/my_profile.xml
	WhatsYourStory/app/src/main/res/values/strings.xml