- Updated to use latest master
Merge branch 'master' of https://github.com/ToxicBakery/Mandelbrot

Conflicts:
	README.md
	src/com/ToxicBakery/apps/mandelbrot/MainActivity.java