Merge branch 'master' of https://github.com/r1chardj0n3s/angboard

Conflicts:
	app/scripts/services/api.js
Merge branch 'master' of https://github.com/neillc/angboard