test
broken down into modules
test
Merge branch 'master' of https://github.com/theGame/paragone-angular

Conflicts:
	.gitignore