ds_store
Merge branch 'master' of https://github.com/ConnorTech/Scientific-Method

Conflicts:
	Scientific Method/.DS_Store