working on it
merge conflict resolved
merge conflict should be resolved now
back end half of ee_sessions working
some front end
Merge branch 'master' into ee_sessions
problems with versions resolved
conduct ee session works front end, back end
Merge pull request #35 from JacobKorn/ee_sessions

Ee sessions
Merge pull request #36 from JacobKorn/master_copy

Master copy