init
Merge branch 'master' of github.com:dingulx2/pumpingtom17

Conflicts:
	venv/bin/activate
	venv/bin/activate.csh
	venv/bin/activate.fish
	venv/bin/easy_install
	venv/bin/easy_install-2.7
	venv/bin/pip
	venv/bin/python
	venv/include/python2.7
	venv/lib/python2.7/UserDict.py
	venv/lib/python2.7/_abcoll.py
	venv/lib/python2.7/_weakrefset.py
	venv/lib/python2.7/abc.py
	venv/lib/python2.7/codecs.py
	venv/lib/python2.7/copy_reg.py
	venv/lib/python2.7/encodings
	venv/lib/python2.7/fnmatch.py
	venv/lib/python2.7/genericpath.py
	venv/lib/python2.7/lib-dynload
	venv/lib/python2.7/linecache.py
	venv/lib/python2.7/locale.py
	venv/lib/python2.7/ntpath.py
	venv/lib/python2.7/orig-prefix.txt
	venv/lib/python2.7/os.py
	venv/lib/python2.7/posixpath.py
	venv/lib/python2.7/re.py
	venv/lib/python2.7/site-packages/pip/__init__.py
	venv/lib/python2.7/site-packages/pip/backwardcompat/__init__.py
	venv/lib/python2.7/site-packages/pip/basecommand.py
	venv/lib/python2.7/site-packages/pip/baseparser.py
	venv/lib/python2.7/site-packages/pip/cmdoptions.py
	venv/lib/python2.7/site-packages/pip/commands/bundle.py
	venv/lib/python2.7/site-packages/pip/commands/freeze.py
	venv/lib/python2.7/site-packages/pip/commands/help.py
	venv/lib/python2.7/site-packages/pip/commands/install.py
	venv/lib/python2.7/site-packages/pip/commands/list.py
	venv/lib/python2.7/site-packages/pip/commands/search.py
	venv/lib/python2.7/site-packages/pip/commands/show.py
	venv/lib/python2.7/site-packages/pip/commands/uninstall.py
	venv/lib/python2.7/site-packages/pip/commands/unzip.py
	venv/lib/python2.7/site-packages/pip/commands/wheel.py
	venv/lib/python2.7/site-packages/pip/commands/zip.py
	venv/lib/python2.7/site-packages/pip/download.py
	venv/lib/python2.7/site-packages/pip/exceptions.py
	venv/lib/python2.7/site-packages/pip/index.py
	venv/lib/python2.7/site-packages/pip/locations.py
	venv/lib/python2.7/site-packages/pip/log.py
	venv/lib/python2.7/site-packages/pip/req.py
	venv/lib/python2.7/site-packages/pip/status_codes.py
	venv/lib/python2.7/site-packages/pip/util.py
	venv/lib/python2.7/site-packages/pip/vcs/bazaar.py
	venv/lib/python2.7/site-packages/pip/vcs/mercurial.py
	venv/lib/python2.7/site-packages/pip/wheel.py
	venv/lib/python2.7/site-packages/pkg_resources.py
	venv/lib/python2.7/site-packages/setuptools/__init__.py
	venv/lib/python2.7/site-packages/setuptools/command/__init__.py
	venv/lib/python2.7/site-packages/setuptools/command/alias.py
	venv/lib/python2.7/site-packages/setuptools/command/bdist_egg.py
	venv/lib/python2.7/site-packages/setuptools/command/bdist_rpm.py
	venv/lib/python2.7/site-packages/setuptools/command/bdist_wininst.py
	venv/lib/python2.7/site-packages/setuptools/command/build_ext.py
	venv/lib/python2.7/site-packages/setuptools/command/build_py.py
	venv/lib/python2.7/site-packages/setuptools/command/easy_install.py
	venv/lib/python2.7/site-packages/setuptools/command/egg_info.py
	venv/lib/python2.7/site-packages/setuptools/command/install.py
	venv/lib/python2.7/site-packages/setuptools/command/install_egg_info.py
	venv/lib/python2.7/site-packages/setuptools/command/install_lib.py
	venv/lib/python2.7/site-packages/setuptools/command/install_scripts.py
	venv/lib/python2.7/site-packages/setuptools/command/register.py
	venv/lib/python2.7/site-packages/setuptools/command/rotate.py
	venv/lib/python2.7/site-packages/setuptools/command/sdist.py
	venv/lib/python2.7/site-packages/setuptools/command/setopt.py
	venv/lib/python2.7/site-packages/setuptools/command/test.py
	venv/lib/python2.7/site-packages/setuptools/command/upload_docs.py
	venv/lib/python2.7/site-packages/setuptools/compat.py
	venv/lib/python2.7/site-packages/setuptools/dist.py
	venv/lib/python2.7/site-packages/setuptools/extension.py
	venv/lib/python2.7/site-packages/setuptools/package_index.py
	venv/lib/python2.7/site-packages/setuptools/sandbox.py
	venv/lib/python2.7/site-packages/setuptools/script template (dev).py
	venv/lib/python2.7/site-packages/setuptools/site-patch.py
	venv/lib/python2.7/site-packages/setuptools/ssl_support.py
	venv/lib/python2.7/site-packages/setuptools/tests/doctest.py
	venv/lib/python2.7/site-packages/setuptools/tests/test_bdist_egg.py
	venv/lib/python2.7/site-packages/setuptools/tests/test_build_ext.py
	venv/lib/python2.7/site-packages/setuptools/tests/test_develop.py
	venv/lib/python2.7/site-packages/setuptools/tests/test_easy_install.py
	venv/lib/python2.7/site-packages/setuptools/tests/test_egg_info.py
	venv/lib/python2.7/site-packages/setuptools/tests/test_packageindex.py
	venv/lib/python2.7/site-packages/setuptools/tests/test_sandbox.py
	venv/lib/python2.7/site-packages/setuptools/tests/test_sdist.py
	venv/lib/python2.7/site-packages/setuptools/tests/test_test.py
	venv/lib/python2.7/site-packages/setuptools/version.py
	venv/lib/python2.7/site.py
	venv/lib/python2.7/sre.py
	venv/lib/python2.7/sre_compile.py
	venv/lib/python2.7/sre_constants.py
	venv/lib/python2.7/sre_parse.py
	venv/lib/python2.7/stat.py
	venv/lib/python2.7/types.py
	venv/lib/python2.7/warnings.py