Test
Merge branch 'master' of https://github.com/tsztoyip/StackPractice

Conflicts:
	.idea/libraries/appcompat_v7_20_0_0.xml
	.idea/libraries/support_v4_20_0_0.xml
	.idea/misc.xml
	Stack Practice/Stack Practice.iml
	Stack Practice/src/main/java/hk/edu/dbs/cl/stackpractice/GameFragment.java
	Stack Practice/src/main/res/layout/fragment_game.xml