setting up basic bar
Merge branch 'master' of https://github.com/sbleika/Blissid

Conflicts:
	.idea/workspace.xml
	BlissAppid_git/BlissAppid/app/src/main/res/layout/activity_main_activity.xml
	BlissAppid_git/BlissAppid/app/src/main/res/values/strings.xml