local commit
local commit
local commit
Merge branch 'develop' of github.com:pateldhruv/inkd into develop

Pulling from dhruv
Set up login and register views with new MVC model
local comit
Fixed merge conflicts