save work at school
updates made in home

Conflicts:
	source/wiki/chemistry-software.markdown
	source/wiki/linux.markdown