nigger
Merge branch 'master' of https://github.com/nokonoko/Hot-Grill

Conflicts:
	README.md
Merge branch 'master' of https://github.com/nokonoko/Hot-Grill

Conflicts:
	README.md