fdffsdf:wq
Merge branch 'master' of https://github.com/talexander/babylon

Conflicts:
	store/static/css/common.css