angular
Merge branch 'master' of https://github.com/xldenis/stackqueue

Conflicts:
	index.html