Testing bitly angular call
Merge branch 'master' of https://github.com/terriblesarcasm/testing-node

Conflicts:
	public/partials/temp