Merge branch 'jc' of https://github.com/EmpireBT/empireBT into hector

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
deleted DS_STORE
Merge branch 'master' into hector

Conflicts:
	.DS_Store
	empirebt/.DS_Store
	empirebt/main/models.py
	empirebt/main/views.py
	empirebt/urls.py
Merge branch 'hector'