going to push to Heroku
Merge branch 'master' of https://github.com/fabianlim/stocks
settings
Conflicts:
	stocks/settings.py