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

Conflicts:
	client/public/css/antbutter.css
Changed app to detect current environment
Merge branch 'master' of https://github.com/blaisebaileyfinnegan/antbutter