fixed merge conflict related syntax error
added nav bars
used divs instead of li for contactsList
all contactsList picture same height
contact pictures same height on categorize as well
changed login buttons
Merge pull request #18 from paninapress/lastminute

Last minute styling and navigation changes
resolved conflicts from upstream pull
fix errors in angular controller
fixed categorize button in dashboard
Merge pull request #19 from melodicodyssey/dashboard_fix

Dashboard fix