Merge branch 'master' of C:\Users\2002917\AndroidStudioProjects\maori-app with conflicts.
added new xml design layouts
created a new class to display diffrent designs