upload bad files
Merge branch 'master' of https://github.com/xpavlic4/geostats2

Conflicts:
	viewpagerindicator/build.gradle
build gradle edit