Add uniqueness to User migration. Adjust nav_bar styling.
Rectify merge-conflict
Merge pull request #29 from Bob-Maestri/Andrew

Andrew