Latest dev work

Conflicts:
	Project2/Trackster.cpp
	Project2/main.cpp
More accurate training
Added fixation target pattern