skeleton portfolio view
Merge pull request #13 from himleyb85/benny

skeleton portfolio view
started ui
Merge pull request #21 from himleyb85/ui

started ui
models so far
Merge branch 'master' of https://github.com/himleyb85/recession_survivor into models
git ignore file.
Merge branch 'master' of https://github.com/himleyb85/recession_survivor into ui
removed venv/ from project
Merge pull request #22 from himleyb85/ui

Ui
model works
Merge branch 'master' of https://github.com/himleyb85/recession_survivor into models
added .gitignore
Merge pull request #23 from himleyb85/models

Models
Merge branch 'devin' of https://github.com/himleyb85/recession_survivor into devin

Conflicts:
	project/game/__pycache__/__init__.cpython-34.pyc
	project/game/__pycache__/admin.cpython-34.pyc
	project/game/__pycache__/models.cpython-34.pyc
	project/portfolio/__pycache__/__init__.cpython-34.pyc
	project/portfolio/__pycache__/admin.cpython-34.pyc
	project/portfolio/__pycache__/models.cpython-34.pyc
	project/project/__pycache__/__init__.cpython-34.pyc
	project/project/__pycache__/settings.cpython-34.pyc
	project/users/__pycache__/__init__.cpython-34.pyc
	project/users/__pycache__/admin.cpython-34.pyc
	project/users/__pycache__/models.cpython-34.pyc
	project/users/migrations/__pycache__/__init__.cpython-34.pyc
merg