mail + design
urls
urls
Merge branch 'master' of github.com:szymonwlochowski/depot

Conflicts:
	app/views/layouts/application.html.erb