remove border
Merge branch 'master' of github.com:ibash/music_fish

Conflicts:
	public/stylesheets/style.styl