ok
Merge branch 'master' of https://github.com/Elarnon/north-american-octo-wight

Conflicts:
	facade/table.py