Merge pull request #23 from himleyb85/models

Models
seeded database.....finally
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
merg
Merge pull request #24 from himleyb85/devin

Devin
sytax fix, minor
Merge pull request #25 from himleyb85/ui

sytax fix, minor
proper ui integration
Merge pull request #26 from himleyb85/ui

proper ui integration
stashing changes
Merge branch 'master' of https://github.com/himleyb85/historical_trader into benny
trying to seed db
database seeding working
Merge pull request #27 from himleyb85/benny

Benny
updating setup instructions
setup instructions 3.0
Merge pull request #28 from himleyb85/benny

updating setup instructions
Update README.md

Simple markdown updates
rough draft users.views