Joe's edits
Merge branch 'master' of https://github.com/Ansrala/Delta_project2

Conflicts:
	p2_delta_ai.cpp
a commmit :)