Now compatible with python2 and python3
Merge branch 'master' of https://github.com/yanatan16/pycodejam

Conflicts:
	codejam/__init__.py
	setup.py
	src/codejam/tests/codejam_test.py
Bump version for python2 compatibility