unkmiittet
Merge remote-tracking branch 'origin/master'

Conflicts:

	BlissAppid_git/BlissAppid/app/src/main/java/com/example/seventeen/blissappid/bio.java