blah
added line charts for offices
merge
Merge branch 'herokusync' into newframework

Conflicts:
	cases/views.py
merge fixes
Merge pull request #23 from maxwolffe/newframework

update master with some charts