moved files, added assets folder, made changes to .gitignore
moved files, updated .gitignore
Merge branch 'master' of https://github.com/meowfreeze/django_startproject

Conflicts:
	README.md