radu/Django-Hackathon-Starter: A boilerplate application for Django web applications. @ 2a73b55a99e29ad43fd0a6cd28dd706e626797b5

Marco Quezada 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request		10 lat temu
..
icon	2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request	10 lat temu
splash	2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request	10 lat temu