aaa
Merge branch 'master' of github.com:interarticle/safe-history

Conflicts:
	js/main.js