cleanup
Cleaned up conflicted pyc files
Fixed linking errors on base.html and add new_tournament and many tournament admin html parts