Automata
Merge branch 'master' of https://github.com/toogy/MajorProject

Conflicts:
	Report/New/Report.pdf