services
fsd
test log in
Merge branch 'master' of https://github.com/ioanaculic/puzzle

Conflicts:
	Puzzle/bin/classes/com/agile/puzzle/MainActivity.class
	bin/classes/com/agile/puzzle/R$attr.class
	bin/classes/com/agile/puzzle/R$dimen.class
	bin/classes/com/agile/puzzle/R$layout.class
	bin/classes/com/agile/puzzle/R$menu.class
	bin/classes/com/agile/puzzle/R$string.class
	bin/classes/com/agile/puzzle/R$style.class
	bin/classes/com/agile/puzzle/R.class
	proiecte test/TestDragAndDrop/gen/com/example/testdraganddrop/R.java