added diff
deleted diff
changed diff
refresh status
Merge branch 'show_status'

* show_status:
  refresh status
  changed diff
  deleted diff
  added diff

Conflicts:
	public/js/application.js
markup change
version 0.1.0