change bg & tagline
Merge branch 'choose-skills-and-interests'

Conflicts:
	WhatsYourStory/app/src/main/res/values/strings.xml
Merge branch 'choose-skills-and-interests'

Conflicts:
	WhatsYourStory/app/src/main/res/layout/activity_choose_skills.xml
	WhatsYourStory/app/src/main/res/values/strings.xml
cleaned head out of manifest.xml
Added slash before apostrophe in string resources
Changed ID for textview
Added comments to login
Cleared head from string res from apostrophe change
Removed Head from misc.xml
Fixed string names for skills in strings.xml
modify list height and change other user bg
Conflicts:
	WhatsYourStory/.idea/misc.xml

WhatsYourStory/app/src/main/res/layout/activity_my_init_profile_settings
.xml
fix init profile oconflict
modify other user profile design
design card style on other user profile
modify other user profile design
Merge branch 'master' into fav_sharedpref_steph

Conflicts:
	WhatsYourStory/.idea/misc.xml
	WhatsYourStory/app/src/main/res/layout/activity_other_user_profile.xml