Implementing changing on same color press in gameplay.
Merge branch 'master' of https://github.com/justinmwarner/Picogram

Conflicts:
	com.picogram.awesomeness/project.properties
	com.picogram.awesomeness/src/com/cameraview/awesomeness/CameraView.java
	com.picogram.awesomeness/src/com/picogram/awesomeness/TouchImageView.java