General doc
Merge branch 'master' of https://github.com/crafn/proto-gamelang

Conflicts:
	plans/functions.markdown