have data from rinxter
Merge branch 'master' of github.com:cross311/slammo into feature/datasource

Conflicts:
	Gemfile
Merge pull request #8 from cross311/feature/datasource

have data from rinxter