some
add chart
Merge remote-tracking branch 'origin/master'

Conflicts:
	sqteam/sqapp/templates/app.html
	sqteam/sqapp/templates/base.html
	sqteam/sqapp/views.py
	sqteam/sqteam/urls.py
baraka