login working maybe
Merge branch 'master' of https://github.com/iz2140/ProjectArtemis