still fixing
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/misc.xml
	app/src/main/java/typical_if/android/Constants.java
still fixing
Merge remote-tracking branch 'origin/master'