Rettede sammenlægning af klip.
Merge branch 'login' of https://github.com/AnalogIO/DigitalClipCards into login

Conflicts:
	clipcards/Database.py