Stuff
Stuff
Merge branch 'master' of https://github.com/MAD-Team-Dots/Dots.git

Conflicts:
	src/com/example/dots/MainActivity.java
Stuff
Merge branch 'master' of https://github.com/MAD-Team-Dots/Dots.git
Merge branch 'master' of https://github.com/MAD-Team-Dots/Dots.git