retrieving profile info on template controller
showing user profile on layout
fixing merge conflicts
grunt serve changes
updated layout with template functionality