changes colors
Easier-on-the-eye-colors

Merge branch 'master' of https://github.com/Cassio90/scatter.git

Conflicts:
	src/de/uulm/mmci/scatter/MainActivity.java