Merge branch 'master' of https://github.com/idolize/myspanishlab-solver

Conflicts:
	.gitignore
	MySpanishLabSafariExtnesion.safariextension/Info.plist
	MySpanishLabSafariExtnesion.safariextension/injected.js
	MySpanishLabSafariExtnesion.safariextz
Merge branch 'master' of https://github.com/idolize/myspanishlab-solver