I will change ui design later
Merge branch 'master' of https://github.com/freeznet/FlippedAndroidApp

Conflicts:
	app/build.gradle
	app/src/main/res/values/colors.xml