Pause button added
Merge branch 'master' of https://github.com/psyduk/throughthevine

Conflicts:
	public/stylesheets/app.css
Pause button added
Merge pull request #11 from alexpaley/master

Pause button added