Updated build instructions to include Haskell and OilrMachine directories
Merge branch 'master' of https://github.com/UoYCS-plasma/GP2

Conflicts:
	README.md