Update .gitignore
Border fix in login.php
Merge branch 'master', remote-tracking branch 'origin' into Dror
new database for sprint 2
Merge branch 'Dror' of https://github.com/ThomasRahn/soen390 into Development
added duration, merged branch with dror, added reset function