Modified Xes
Merge branch 'master' of https://github.com/wanmen/Schr-dinger-s-Cat

Conflicts:
	log/development.log
Merge branch 'master' of https://github.com/wanmen/Schr-dinger-s-Cat

Conflicts:
	log/development.log
Ignored Development Log File
Merge branch 'master' of https://github.com/wanmen/Schr-dinger-s-Cat

Conflicts:
	app/views/departments/index.html.erb
	app/views/departments/show.html.erb
	db/development.sqlite3
	log/development.log