back on the right track, nav work coming
login update
Merge pull request #21 from kevinuhrmacher/master

back on the right track, nav work coming
Merge pull request #22 from afortune906/master

april 16 changes
cleaning up templates