* added second step to register
Merge branch 'master' of https://github.com/rreimi/jynx
Merge branch 'master' of https://github.com/rreimi/jynx
* changed login
- added navbar