Routes set up
User authentication almost finished, now to work on registration
Fixed merge conflicts