Merge pull request #1 from sodamodo/master

Merging commits to my fork
Merge pull request #2 from sodamodo/master

Mergin
Merge pull request #3 from sodamodo/master

Mergin
Fixed Base links

Now that registration forms are complete I fixed links in base html to work correctly.  I also fixed the style in which the links were written in the nav bar.
Merge remote-tracking branch 'origin/master'
Merge pull request #3 from crswint/master

Fixed link tags