Adding conflictTopo test
Merge branch 'ft-course' of github.com:mangalaman93/pyretic into ft-course