Update meteor
Not using modal. Using regular page instead for login and register
Merge conflict