sorted names
fixed encoding of file
added intellij
Merge branch 'master' of https://github.com/matijsmoest/psd_team1
upt
Merge branch 'master' of https://github.com/matijsmoest/psd_team1
tests work (but fail)
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/command/library/CmdTime.java