commiting before sync
commiting before sync
Merge branch 'backendSuperBranch' of https://github.com/rhiwri/GradProject_Android into backendSuperBranch

Conflicts:
	bin/classes/com/example/gradproject_android/BabyActivity.class
	bin/classes/com/example/gradproject_android/LoginActivity.class
	bin/classes/com/example/gradproject_android/R$drawable.class
	bin/classes/com/example/gradproject_android/R$id.class
	bin/classes/com/example/gradproject_android/R$layout.class
	bin/classes/com/example/gradproject_android/R$menu.class
	bin/classes/com/example/gradproject_android/R$string.class
	bin/classes/com/example/gradproject_android/R$style.class
	bin/classes/com/example/gradproject_android/RegisterActivity.class
	gen/com/example/gradproject_android/R.java
	res/layout/create_baby_list.xml
	res/layout/create_list.xml
display list of products, links of events and create list working
commit files to ignore
commiting before sync
Merge branch 'backendSuperBranch' of https://github.com/rhiwri/GradProject_Android into backendSuperBranch

Conflicts:
	bin/classes/com/example/gradproject_android/LoginActivity.class
	bin/classes/com/example/gradproject_android/R$drawable.class
	bin/classes/com/example/gradproject_android/R$id.class
	bin/classes/com/example/gradproject_android/R$layout.class
	bin/classes/com/example/gradproject_android/R$menu.class
	bin/classes/com/example/gradproject_android/R$string.class
	bin/classes/com/example/gradproject_android/R$style.class
	bin/classes/com/example/gradproject_android/RegisterActivity.class
	gen/com/example/gradproject_android/R.java
	res/layout/create_baby_list.xml
	res/layout/create_list.xml