The First
First commit
First commit
First commit
Second commit
Third commit
Fourth commit
Fourth commit
Fourth commit
Fourth commit
Fourth commit
Fifth commit
Fifth commit
Sixth commit
Sixth commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	Karaoke.ipr
	src/main/java/karaoke/client/presenter/WorkPresenter.java
	src/main/java/karaoke/client/view/WorkView.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	Karaoke.iws
Begin of Editor