navigator, login
fix confict
Fix conflict part 4
fixing conflicts
fix confix 5
Merge pull request #18 from railsrumble/designfix

Designfix
Fixing conflicts