Changed  the methods so that it now takes an argument of whether you want the screenshot to be halved.

Conflicts:
	framework/models/game_models.py
Changed  the methods so that it now takes an argument of whether you want the screenshot to be halved.

Conflicts:
	framework/models/game_models.py
Changed  the methods so that it now takes an argument of whether you want the screenshot to be halved.

Conflicts:
	framework/models/game_models.py
Merge branch 'master' of https://github.com/leifos/ifind
Changed  the methods so that it now takes an argument of whether you want the screenshot to be halved.

Conflicts:
	framework/models/game_models.py
Changed  the methods so that it now takes an argument of whether you want the screenshot to be halved.

Conflicts:
	framework/models/game_models.py
Merge branch 'master' of https://github.com/leifos/ifind
Changed  the methods so that it now takes an argument of whether you want the screenshot to be halved.

Conflicts:
	framework/models/game_models.py
Merge branch 'master' of https://github.com/leifos/ifind
Changed  the methods so that it now takes an argument of whether you want the screenshot to be halved.

Conflicts:
	framework/models/game_models.py
Merge branch 'master' of https://github.com/leifos/ifind
Merge branch 'master' of https://github.com/leifos/ifind
Changed  the methods so that it now takes an argument of whether you want the screenshot to be halved.

Conflicts:
	framework/models/game_models.py
Changed the Ajax from using html to using Json.
Still need some modifications to finish!

Conflicts:
	framework/models/game_models.py
Changed the Ajax from using html to using Json.
Still need some modifications to finish!

Conflicts:
	framework/models/game_models.py
Changed the Ajax from using html to using Json.

Conflicts:
	framework/models/game_models.py
Merge branch 'master' of https://github.com/leifos/ifind
Changed the Ajax from using html to using Json.

Conflicts:
	framework/models/game_models.py
Changed the Ajax from using html to using Json.

Conflicts:
	framework/models/game_models.py
Merge branch 'master' of https://github.com/leifos/ifind