add href
add href
-m "message"
add Bootstrap
Merge branch 'master' of github.com:CoincoinNico/buylocally

Conflicts:
	app/assets/stylesheets/index.css
	app/views/articles/index.html.erb
	app/views/layouts/application.html.erb
Merge pull request #7 from CoincoinNico/simon

Simon