Merge pull request #6 from dylanclement/develop

Develop into master
Fix shrinkwrap.
Loading from file in series to make sure we don't add duplicates.
Merge branch 'develop' of github.com:dylanclement/in4mahcy into async_load_from_file_in_series

Conflicts:
	data/relations.json
	package.json
Merge branch 'master' of github.com:dylanclement/in4mahcy into async_load_from_file_in_series
Merge pull request #7 from dylanclement/async_load_from_file_in_series

Loading from file sometimes creates a duplicate key
Merge in master