rails upgrade en sass ipv less
Merge pull request #2 from vitadewi/master

rails upgrade en sass ipv less
Fix link on resources index
Include psych explicitly to prevent conflicts with other apps.
Merge pull request #10 from Annebeth/FixedLink

Fix link on resources index
Merge branch 'master' of github.com:sijbrandij/railsgirls-nl

Conflicts:
	Gemfile.lock
	app/views/resources/index.html.erb

:q
forgot to add show