...
...
Merge branch 'master' of github.com:lemade/outside

Conflicts:
	app/assets/stylesheets/public/general.scss.erb
	app/views/layouts/public.html.erb
	outside_development
solved merge conflicts
public issue styles