fixed tabs
Merge branch 'master' of https://github.com/blaisebaileyfinnegan/antbutter

Conflicts:
	public/js/antbutter.js