initial commit
second commit
additional changes
3rd test commit changed testfile.txt
another test
made sock application with variables
Merge branch 'master' of https://github.com/ethand320/django_project
Merge branch 'master' of https://github.com/ethand320/socksapp

Conflicts:
	.gitignore
	manage.py