foo
Merge branch 'master' of github.com:sushack/do

Conflicts:
	public/css/style.css