Merge branch 'master' into update
another edit
more edits
again
again
again
Add first set of Refills (liquid)
delete misspelled .gitnore
Merge branch 'update'

Conflicts:
	README.md
Merged