Merge pull request #18 from hestervanwijk/master

removed duplicate event def
Merge pull request #20 from hestervanwijk/upvote

added up/downvotes
Revert "Include psych explicitly to prevent conflicts with other apps."

This reverts commit 38384f5e697187f5b46de0a61b88c64bf8806863.
Merge pull request #21 from iain/remove-psych

Revert "Include psych explicitly to prevent conflicts with other apps."
Use PostgreSQL for deployment with Heroku. #4
Merge branch 'master' of github.com:sijbrandij/railsgirls-nl

Conflicts:
	Gemfile.lock
Configured for deployment with Heroku. #4
Temporary fixes for deployment to Heroku. #4
Merge pull request #25 from hestervanwijk/master

added thumbs for resources upvote
Merge pull request #27 from hestervanwijk/master

comments on resources
Merge pull request #28 from hestervanwijk/master

added edit link to resources table
Merge pull request #29 from hestervanwijk/master

change appearance of resource link
Update README
Move database.yml to database.yml.example
Add latest event and link to meetup to home.
Merge branch 'master' of github.com:sijbrandij/railsgirls-nl
Add events resource, import for meetup events, functionality for creating events manually. #23
Only show event attributes if they are present. #23
Update schema.rb
Revert "Update schema.rb"

This reverts commit f6f65654e0a627c7e78ff92ee95dc14c63d92ec6.