style changes
Merge branch 'master' of https://github.com/nicki9knuckles/paralist

Conflicts:
	public/js/services/user.js