Worked on a basic layout and fragments
Worked on basic layout and fragments
Merge branch 'yudasinal'
Merged branches