Update base.md
Merge branch 'master' of github.com:wemakeprice/dev into new

Conflicts:
	base.md