Vagrantfile
Vagrantfile
Merge branch 'master' of github.com:KixPanganiban/Agila
Moved graph JS code to the html because lol Django
Merge branch 'master' of github.com:KixPanganiban/Agila

Conflicts:
	webapp/templates/dashboard-analytics.html