Added return statement to render functions
Merge branch 'mvcBased' into solution1
Added id to li
Merge branch 'mvcBased' into solution1