gittt
Merge branch 'master' of https://github.com/sbleika/Blissid

Conflicts:

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