dependency location change
dependency changes
Merge branch '1.x'

Conflicts:
	medium.js
Merge branch 'master' of https://github.com/jakiestfu/Medium.js
dependency updates
Merge pull request #85 from morgante/master

Merge pull request #6 from jakiestfu/master
Merge pull request #7 from jakiestfu/master

Upstream