I think theo was doing something
Merge branch 'master' of https://github.com/theopak/steno

# By Theodore X. Pak
# Via Theodore X. Pak
* 'master' of https://github.com/theopak/steno:
  Major major good work!
  Build
  Updates screenshot.
  Updates favicon.

Conflicts:
	frontend/app/scripts/controllers/ResultsCtrl.js
hi
Merge branch 'master' of https://github.com/theopak/steno

# By Theodore X. Pak
# Via Theodore X. Pak
* 'master' of https://github.com/theopak/steno:
  Minor.

Conflicts:
	frontend/app/scripts/controllers/ResultsCtrl.js