The symlink solution was not as easy as we hoped it would be
Merge branch 'james_branch_2' into dev
Merge branch 'dev' of github.com:c1moore/cen3031project into dev