changed meetup group, added show resouce and awesome print
Merge branch 'master' of github.com:sijbrandij/railsgirls-nl

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

:q
forgot to add show
Merge pull request #13 from hestervanwijk/master

changed group into railsgirls