Updated everything
Merge branch 'master' of https://github.com/arkansasred/metacog_game

Conflicts:
	Subject 2/Familiarization/Ahitplayer.txt
	Subject 2/Familiarization/Akills.txt
	Subject 2/Familiarization/Awronghits.txt
	Subject 2/Familiarization/Bkills.txt
	Subject 2/Familiarization/Bwronghits.txt
	Subject 2/Familiarization/captures.txt
	Subject 2/Familiarization/shots.txt
	Subject 2/PreTest/Awronghits.txt
	Subject 2/PreTest/Bhitplayer.txt
	bullet.pyc
	enemy.py
	enemy.pyc
	familiarization.py
	familiarization.pyc
	familiarization_game.py
	global_variables.pyc
	player.py
	player.pyc
	post_test.py
	post_test_game.py
	pre_test.py
	pre_test.pyc
	pre_test_game.py
	training_1.py
	training_1.pyc
	training_2.py
	training_no_labels.py
	training_with_labels.py
	vector.pyc