fdsfs
Merge remote-tracking branch 'origin/master'

Conflicts:
	Janlist/.idea/workspace.xml
Some stuff done