Install haml
Create angular controller, take 10 snapshots per second
Merge branch 'master' of github.com:tilt/socially_awkward

Conflicts:
	Gemfile.lock