ome more stuff for the boilerplate
Merge branch 'master' of https://github.com/vroudge/Multicode

Conflicts:
	CONTRIBUTING.md