many files deleted
Merge branch 'master' of https://github.com/ksb890616/GDG-SSU

Conflicts:
	apps/templates/navbar.html