Merge branch 'master' of D:\Ruby&Rails\project_management with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Merge branch 'master' of D:\Ruby&Rails\project_management with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	app/assets/stylesheets/base_information.css.scss
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	app/assets/stylesheets/base_information.css.scss