schema
Merge branch 'master' of github.com:gedankenstuecke/snpr

Conflicts:
	db/schema.rb