message parsing
Merge branch 'master' of https://github.com/cabbibo/beyond

Conflicts:
	index.html