Snapshot of work so far
Merge branch 'master' of github.com:GDGCapeTown/CraftersOnline

Conflicts:
	crafting/main.py