! exclude workspace.xml
! update gitignore
Merge branch 'devel' of https://github.com/MasterCybo/Chronoline into devel

Conflicts:
	.idea/workspace.xml