Set
Merge branch 'master' of https://github.com/badlog/TrainNote

Conflicts:
	TrainNoteProject/.idea/vcs.xml
	TrainNoteProject/.idea/workspace.xml