removed footer from first.php and loggedInTemplate.php[master]
fixed merge conflict in first.php. Recommitting...[master]