navigator, login
Merge pull request #14 from railsrumble/designfix

fix conflicx
fix confict
Fix conflict part 4
fixing conflicts
fix confix 5