markup tweets gatos
plis plis plis
Merge branch 'master' of https://github.com/gatikman/vending

Conflicts:
	public/js/controller.js