new class
some minor changes
team 1 does coding
merge master into team_1
some changes
Merge remote-tracking branch 'origin/master' into team_1

Conflicts:
	app/src/main/java/com/dybas/firstintellijapp/app/MainActivity.java
Merge branch 'master' into team_2
Merge branch 'team_2'