Main Page and MY info
Fixed conflicts
Merge branch 'rnavagamuwa-master'