fix
Merge branch 'master' of github.com:naoyeye/onespace

Conflicts:
	styles/responsive.css