With the Dr. Friday Drill-Down.
A few extras.
Merge remote-tracking branch 'pivot/master' into atsync

Conflicts:
	frontend/html/basicdisplay.html
	frontend/static/javascripts/samples.js
Merge remote-tracking branch 'marvin/master'
Ignore SASS cache files. Updating script comments.
Merge remote-tracking branch 'marvin/master'
Merge remote-tracking branch 'pivot/master'
Merge remote-tracking branch 'pivot/master'
Merge branch 'master' of https://github.com/revence27/iminsi-gihumbi