test
Merge branch 'master' of https://github.com/ioanaculic/puzzle

Conflicts:
	Puzzle/res/layout/activity_main.xml
test