Commit 0b605bac authored by Whitney Armstrong's avatar Whitney Armstrong
Browse files

Merge branch 'master' into readme_2

Conflicts:
	README.md
parents 7be94eaf cc7998b0
......@@ -2,4 +2,10 @@
## Overview
This is the overview
## Introduction
This is an introduction.
Argonne EIC software tutorial etc.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment