for merges
Merge branch 'master' of https://github.com/roadan/ranter-node

Conflicts:
	api/rants.js
	public/js/app.js