updated .htaccess file
Merge branch 'master' of https://github.com/mikekucharski/inkd
local commit
testing
local commit
moving to new index file
Merge branch 'develop' of github.com:pateldhruv/inkd into develop

Pulling from dhruv
Set up login and register views with new MVC model