Merge pull request #7 from amulius/login-julian

Login julian
start of testing and depoy
Merge pull request #8 from amulius/testing-deploy

start of testing and depoy
preparing for new merge
Merge branch 'dev' of github.com:amulius/group-project-base into login-julian