GameLogic finished
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/misc.xml
	.idea/workspace.xml
	KenKen.iml
	project.properties
	res/layout/fragment_puzzle_run_game.xml
	res/values/colors.xml
	src/kenken/com/ui/activities/ActivityPuzzleRun.java
	src/kenken/com/ui/fragments/FragmentChosePuzzle.java
	src/kenken/com/ui/fragments/FragmentPuzzleRunGame.java
GameMerged
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
GameFunctinality finished