change the setting file
Merge branch 'master' of https://github.com/rixardxxd/food2cube_release
lala
Merge branch 'master' of https://github.com/rixardxxd/food2cube_release
aaa
update
aa
Merge branch 'master' of https://github.com/rixardxxd/food2cube_release
fix
Conflicts:
	.gitignore
	food2cube/settings.py
	food2cube/static/mainSite/app/scripts/app.js
	food2cube/static/mainSite/app/scripts/services/Company.js
	food2cube/static/mainSite/app/views/company.html
	food2cube/static/mainSite/css/landing.css
requirement.txt
aa
resovle conflict
resolve conflict