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

Conflicts:
	Puzzle/bin/Puzzle.apk
	Puzzle/bin/classes.dex
	Puzzle/bin/classes/upb/puzzle/MainActivity.class
	Puzzle/bin/resources.ap_
	Puzzle/res/layout/activity_main.xml
	Puzzle/src/upb/puzzle/MainActivity.java