test
test
test
add basic activity and fragment working on it
add basic activity and fragment working on it2
Merge branch 'Preferences' into controller

Conflicts:
	.idea/workspace.xml
Merge branch 'Preferences' into controller

Conflicts:
	.idea/workspace.xml
merged the controller and preferences branch, wokring on controllger fragment