Create group
gitignore config
Merge remote-tracking branch 'origin/master' into fb_1

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/com/example/satyinalive/app/MainActivity.java
	app/src/main/res/values/strings.xml