Somehow working
Somehow working
Merge branch 'OccurenceMapMethod' of github.com:gleniam/3SAT_CNF into OccurenceMapMethod

Conflicts:
	SlowSATSolver/src/ProfilingStuff/CNFSatInstance.java
Trying to fix conflicts
Merge branch 'HistoryStack' of github.com:gleniam/3SAT_CNF into HistoryStack

Conflicts:
	arrayForm/CNFSatInstance.java
	arrayForm/CNFparser.java
still trying to fix conflict