Added support for infeasible path constraints
Merge done

Merge branch 'master' of https://github.com/abetts155/WCET

Conflicts:
	RTSS2013/src/Calculations.py
	RTSS2013/tests/program1.traces
	RTSS2013/tests/program1.txt