branch test
frontpage
front2
img old carrousel delete
frontpage 3
front bug
frontpage3
front trash
Merge branch 'master' of https://github.com/ging/vish into frontpage

Conflicts:
	README.rdoc
	app/views/frontpage/index.html.erb
new new new frontpage
Merge branch 'frontpage' of github.com:ging/vish into frontpage
Merge branch 'master' of github.com:ging/vish into frontpage
front
frontapage white
Merge branch 'master' of github.com:ging/vish into frontpage
Merge branch 'frontpage' of github.com:ging/vish into frontpage
front responsive
Merge branch 'master' of github.com:ging/vish into frontpage
img responsive
circle