Added element override/option
Merge branch '1.x'

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

Merge pull request #4 from jakiestfu/master
Merge pull request #5 from jakiestfu/master

Upstream