Second commit. Should have all the changes now
Merge branch 'master' of github.com:mfilmer/Game-Dice

Conflicts:
	res/layout/tao_fragment.xml
	src/com/example/gamedice/MainActivity.java