Rearanged footer and login info
fixed pages
conflict
conflict levii
conflict 2nd try
Conflict solve
merge
Date picked// manual merge for conflicts