refactoring
Future buffer (Homework)
Merge branch 'master' of https://github.com/AlexNava/wtf

Conflicts:
	Agent.cpp
	Agent.h