"done"
x


quit
lease enter the commit message for your changes. Lines starting
erge branch 'master' of github.com:Tanq/midterm

Conflicts:
	public/css/application.css