init
get
details up
add tabs
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	.gitignore
	core/admin.py
	core/models.py
	core/urls.py
	core/views.py
	main/settings.py
	main/templates/index.html