updated dependencies
0.3.0
0.3.1
Merge remote-tracking branch 'upstream/master'

Conflicts:
	package.json