Merge commit '44a0bad' into merge-fix
Merge commit '4ad1fb8' into merge-fix

Conflicts:
	js/main.js
Got help text sliding in and out, now to write it
Added help text, fixed #8
Merge branch 'master' into HEAD

Conflicts:
	js/main.js
Merge pull request #19 from danieltcv/merge-fix

Merge fix
Hopefully sorted merge conflict correctly
Create README.md
Help text is a little nicer
started work
Merge branch 'comparechart' into selector-testing

Conflicts:
	js/main.js