Wrote short about how we have handled conflicts. Added TODO's in Testing chapter.
Merge branch 'master' of https://github.com/vonbob/Fall_Prevention_2013

Conflicts:
	Report/ProjectManagementChapter.tex